Skip to content

Commit 30f3d06

Browse files
committed
Updated dependencies: toml-config to 0.4 and serde to 0.7
1 parent 93e65b8 commit 30f3d06

File tree

11 files changed

+22
-21
lines changed

11 files changed

+22
-21
lines changed

TODO.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,6 @@
8181
- Rename Components If Necessary (Done)
8282
- Derive Relevant Traits For All Structs/Enums (Done)
8383
- Implement Display For Relevant Structs/Enums (Done)
84-
- Write Tests (-)
84+
- Write Tests (Done)
8585
- Write Docs (-)
8686
- Split Core/Server/Client Into Separate Crates (Done)

exar-core/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ indexed-line-reader = "0.2"
88
rand = "0.3"
99
time = "0.1"
1010
rustc-serialize = { optional = true, version = "0.3" }
11-
serde = { optional = true, version = "0.6" }
12-
serde_macros = { optional = true, version = "0.6" }
11+
serde = { optional = true, version = "0.7" }
12+
serde_macros = { optional = true, version = "0.7" }
1313

1414
[features]
1515
rustc-serialization = ["rustc-serialize"]
1616
serde-serialization = ["serde", "serde_macros"]
1717

1818
[dev-dependencies]
1919
exar-testkit = { version = "0.1", path = "../exar-testkit" }
20-
serde_json = "0.6"
20+
serde_json = "0.7"

exar-core/src/error.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use super::*;
22

3-
use std::error::Error;
43
use std::fmt::{Display, Formatter, Result as DisplayResult};
54
use std::io::{Error as IoError, ErrorKind};
65

exar-core/src/log.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use super::*;
33
use indexed_line_reader::*;
44

55
use std::fs::*;
6-
use std::io::{BufReader, BufWriter, BufRead, Read, Write};
6+
use std::io::{BufReader, BufWriter, BufRead};
77

88
#[derive(Clone, Debug, PartialEq, Eq)]
99
pub struct Log {

exar-core/src/routing_strategy.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@ impl Decodable for RoutingStrategy {
3636
impl Serialize for RoutingStrategy {
3737
fn serialize<S: Serializer>(&self, serializer: &mut S) -> Result<(), S::Error> {
3838
match *self {
39-
RoutingStrategy::Random => serializer.visit_str("Random"),
40-
RoutingStrategy::RoundRobin(_) => serializer.visit_str("RoundRobin")
39+
RoutingStrategy::Random => serializer.serialize_str("Random"),
40+
RoutingStrategy::RoundRobin(_) => serializer.serialize_str("RoundRobin")
4141
}
4242
}
4343
}
4444

4545
#[cfg(feature = "serde-serialization")]
4646
impl Deserialize for RoutingStrategy {
4747
fn deserialize<D: Deserializer>(deserializer: &mut D) -> Result<Self, D::Error> {
48-
deserializer.visit_str(RoutingStrategyVisitor)
48+
deserializer.deserialize_str(RoutingStrategyVisitor)
4949
}
5050
}
5151

exar-core/src/util.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ mod tests {
6262
use super::super::*;
6363

6464
use std::fs::*;
65-
use std::io::{BufRead, BufReader, BufWriter, Write, Seek, SeekFrom};
65+
use std::io::{BufRead, BufReader, BufWriter, Seek, SeekFrom};
6666

6767
#[test]
6868
fn test_write_line() {

exar-db/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ clap = "2.1"
88
exar = { version = "0.1", path = "../exar-core", features = ["rustc-serialization"] }
99
exar-server = { version = "0.1", path = "../exar-server", features = ["rustc-serialization"] }
1010
rustc-serialize = "0.3"
11-
toml-config = "0.2"
11+
toml-config = "0.4"
1212

1313
[profile.release]
1414
debug = true

exar-server/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ authors = ["Bruno Filippone <[email protected]>"]
77
exar = { version = "0.1", path = "../exar-core" }
88
exar-net = { version = "0.1", path = "../exar-net" }
99
rustc-serialize = { optional = true, version = "0.3" }
10-
serde = { optional = true, version = "0.6" }
11-
serde_macros = { optional = true, version = "0.6" }
10+
serde = { optional = true, version = "0.7" }
11+
serde_macros = { optional = true, version = "0.7" }
1212

1313
[features]
1414
rustc-serialization = ["rustc-serialize"]

exar-ui/src/views/connection-handler.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ <h4>Connection</h4>
3939
<form class="form-inline">
4040
<h3>Publish</h3>
4141
<input type="text" class="form-control" value.bind="data" placeholder="Event Data">
42-
<input type="text" class="form-control" value.bind="tags" placeholder="Space Separated Tags">
42+
<input type="text" class="form-control" value.bind="tags" placeholder="Space-Separated Tags">
4343
<button type="submit" class="btn btn-default" click.delegate="publish()"
4444
disabled.bind="subscription">Publish</button>
4545
</form>

test-all

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/bash
2+
3+
cd ./exar-core && cargo test && cargo test --features serde-serialization --no-default-features &&
4+
cd ../exar-net && cargo test &&
5+
cd ../exar-server && cargo test && cargo test --features serde-serialization --no-default-features &&
6+
cd ../exar-client && cargo test &&
7+
cd ../exar-testkit && cargo test &&
8+
cd ../exar-db && cargo test &&
9+
cd ..

test-all.sh

-7
This file was deleted.

0 commit comments

Comments
 (0)