aboutsummaryrefslogtreecommitdiff
path: root/tests/formatting.rs
diff options
context:
space:
mode:
Diffstat (limited to 'tests/formatting.rs')
-rw-r--r--tests/formatting.rs21
1 files changed, 12 insertions, 9 deletions
diff --git a/tests/formatting.rs b/tests/formatting.rs
index b8f4082..10fb165 100644
--- a/tests/formatting.rs
+++ b/tests/formatting.rs
@@ -1,19 +1,22 @@
-extern crate rustc_serialize;
+extern crate serde;
+#[macro_use]
+extern crate serde_derive;
extern crate toml;
-use toml::encode_str;
-#[derive(Debug, Clone, Hash, PartialEq, Eq, RustcEncodable, RustcDecodable)]
+use toml::to_string;
+
+#[derive(Debug, Clone, Hash, PartialEq, Eq, Serialize, Deserialize)]
struct User {
pub name: String,
pub surname: String,
}
-#[derive(Debug, Clone, Hash, PartialEq, Eq, RustcEncodable, RustcDecodable)]
+#[derive(Debug, Clone, Hash, PartialEq, Eq, Serialize, Deserialize)]
struct Users {
pub user: Vec<User>,
}
-#[derive(Debug, Clone, Hash, PartialEq, Eq, RustcEncodable, RustcDecodable)]
+#[derive(Debug, Clone, Hash, PartialEq, Eq, Serialize, Deserialize)]
struct TwoUsers {
pub user0: User,
pub user1: User,
@@ -21,7 +24,7 @@ struct TwoUsers {
#[test]
fn no_unnecessary_newlines_array() {
- assert!(!encode_str(&Users {
+ assert!(!to_string(&Users {
user: vec![
User {
name: "John".to_string(),
@@ -32,13 +35,13 @@ fn no_unnecessary_newlines_array() {
surname: "Dough".to_string(),
},
],
- })
+ }).unwrap()
.starts_with("\n"));
}
#[test]
fn no_unnecessary_newlines_table() {
- assert!(!encode_str(&TwoUsers {
+ assert!(!to_string(&TwoUsers {
user0: User {
name: "John".to_string(),
surname: "Doe".to_string(),
@@ -47,6 +50,6 @@ fn no_unnecessary_newlines_table() {
name: "Jane".to_string(),
surname: "Dough".to_string(),
},
- })
+ }).unwrap()
.starts_with("\n"));
}