Merge pull request #128 from DenisKolodin/new-deps

Fixes for RFC 1214

Author: vkarpov15

Cargo.lock

@@ -173,7 +173,7 @@ fn read_pref_tags() {
             let options = connstr.options.unwrap();
             assert_eq!(options.read_pref_tags.len(), prefs.len());
 
-            for i in (0..prefs.len()-1) {
+            for i in 0..prefs.len()-1 {
                 assert_eq!(prefs[i], options.read_pref_tags[i]);
             }
         }

tests/client/connstring.rs

@@ -118,7 +118,7 @@ fn get_tests(object: &Object) -> Result<Vec<Test>, String> {
     Ok(tests)
 }
 
-pub trait SuiteContainer {
+pub trait SuiteContainer: Sized {
     fn from_file(path: &str) -> Result<Self, String>;
     fn get_suite(&self) -> Result<Suite, String>;
 }

tests/json/crud/reader.rs

@@ -8,10 +8,10 @@ pub mod server_selection;
 
 use rustc_serialize::json::Object;
 
-pub trait FromJson {
+pub trait FromJson: Sized {
     fn from_json(object: &Object) -> Self;
 }
 
-pub trait FromJsonResult {
+pub trait FromJsonResult: Sized {
     fn from_json(object: &Object) -> Result<Self, String>;
 }

tests/json/mod.rs

@@ -51,7 +51,7 @@ fn get_phases(object: &Object) -> Result<Vec<Phase>, String> {
     Ok(phases)
 }
 
-pub trait SuiteContainer {
+pub trait SuiteContainer: Sized {
     fn from_file(path: &str) -> Result<Self, String>;
     fn get_suite(&self) -> Result<Suite, String>;
 }

tests/json/sdam/reader.rs

@@ -35,7 +35,7 @@ fn get_server_array(arr: &Vec<Json>) -> Result<Vec<Server>, String> {
     Ok(servers)
 }
 
-pub trait SuiteContainer {
+pub trait SuiteContainer: Sized {
     fn from_file(path: &str) -> Result<Self, String>;
     fn get_suite(&self) -> Result<Suite, String>;
 }