From 1eb140881b26328ed1b17615fee32427baafadf6 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 1 Oct 2020 14:45:50 +0200 Subject: Run cargo-fmt Signed-off-by: Matthias Beyer --- tests/errors.rs | 32 ++++++++++++++++++++++---------- tests/file_hjson.rs | 2 +- tests/file_ini.rs | 7 +++++-- tests/file_json.rs | 7 +++++-- tests/file_toml.rs | 7 +++++-- tests/file_yaml.rs | 9 ++++++--- tests/get.rs | 8 +++++++- 7 files changed, 51 insertions(+), 21 deletions(-) (limited to 'tests') diff --git a/tests/errors.rs b/tests/errors.rs index 3a626c7..e59608e 100644 --- a/tests/errors.rs +++ b/tests/errors.rs @@ -21,12 +21,15 @@ fn test_error_parse() { let mut c = Config::default(); let res = c.merge(File::new("tests/Settings-invalid", FileFormat::Toml)); - let path : PathBuf = ["tests", "Settings-invalid.toml"].iter().collect(); + let path: PathBuf = ["tests", "Settings-invalid.toml"].iter().collect(); assert!(res.is_err()); assert_eq!( res.unwrap_err().to_string(), - format!("failed to parse datetime for key `error` at line 2 column 9 in {}", path.display()) + format!( + "failed to parse datetime for key `error` at line 2 column 9 in {}", + path.display() + ) ); } @@ -36,12 +39,15 @@ fn test_error_type() { let res = c.get::("boolean_s_parse"); - let path : PathBuf = ["tests", "Settings.toml"].iter().collect(); + let path: PathBuf = ["tests", "Settings.toml"].iter().collect(); assert!(res.is_err()); assert_eq!( res.unwrap_err().to_string(), - format!("invalid type: string \"fals\", expected a boolean for key `boolean_s_parse` in {}", path.display()) + format!( + "invalid type: string \"fals\", expected a boolean for key `boolean_s_parse` in {}", + path.display() + ) ); } @@ -83,11 +89,14 @@ fn test_error_enum_de() { "value of enum Diode should be represented by either string or table with exactly one key" ); - - let confused_v: Value = - [("Brightness".to_string(), 100.into()), - ("Blinking".to_string(), vec![300, 700].into())] - .iter().cloned().collect::>().into(); + let confused_v: Value = [ + ("Brightness".to_string(), 100.into()), + ("Blinking".to_string(), vec![300, 700].into()), + ] + .iter() + .cloned() + .collect::>() + .into(); let confused_d = confused_v.try_into::(); assert_eq!( confused_d.unwrap_err().to_string(), @@ -114,7 +123,10 @@ inner: let mut cfg = Config::new(); cfg.merge(File::from_str(CFG, FileFormat::Yaml)).unwrap(); let e = cfg.try_into::().unwrap_err(); - if let ConfigError::Type { key: Some(path), .. } = e { + if let ConfigError::Type { + key: Some(path), .. + } = e + { assert_eq!(path, "inner.test"); } else { panic!("Wrong error {:?}", e); diff --git a/tests/file_hjson.rs b/tests/file_hjson.rs index 70d7ca0..87318eb 100644 --- a/tests/file_hjson.rs +++ b/tests/file_hjson.rs @@ -70,7 +70,7 @@ fn test_error_parse() { let mut c = Config::default(); let res = c.merge(File::new("tests/Settings-invalid", FileFormat::Hjson)); - let path : PathBuf = ["tests", "Settings-invalid.hjson"].iter().collect(); + let path: PathBuf = ["tests", "Settings-invalid.hjson"].iter().collect(); assert!(res.is_err()); assert_eq!( diff --git a/tests/file_ini.rs b/tests/file_ini.rs index 0b7b6a0..088eb2c 100644 --- a/tests/file_ini.rs +++ b/tests/file_ini.rs @@ -58,11 +58,14 @@ fn test_error_parse() { let mut c = Config::default(); let res = c.merge(File::new("tests/Settings-invalid", FileFormat::Ini)); - let path : PathBuf = ["tests", "Settings-invalid.ini"].iter().collect(); + let path: PathBuf = ["tests", "Settings-invalid.ini"].iter().collect(); assert!(res.is_err()); assert_eq!( res.unwrap_err().to_string(), - format!(r#"2:0 Expecting "[Some('='), Some(':')]" but found EOF. in {}"#, path.display()) + format!( + r#"2:0 Expecting "[Some('='), Some(':')]" but found EOF. in {}"#, + path.display() + ) ); } diff --git a/tests/file_json.rs b/tests/file_json.rs index 09c42bb..307312e 100644 --- a/tests/file_json.rs +++ b/tests/file_json.rs @@ -70,11 +70,14 @@ fn test_error_parse() { let mut c = Config::default(); let res = c.merge(File::new("tests/Settings-invalid", FileFormat::Json)); - let path_with_extension : PathBuf = ["tests", "Settings-invalid.json"].iter().collect(); + let path_with_extension: PathBuf = ["tests", "Settings-invalid.json"].iter().collect(); assert!(res.is_err()); assert_eq!( res.unwrap_err().to_string(), - format!("expected `:` at line 4 column 1 in {}", path_with_extension.display()) + format!( + "expected `:` at line 4 column 1 in {}", + path_with_extension.display() + ) ); } diff --git a/tests/file_toml.rs b/tests/file_toml.rs index 4d2015e..b964586 100644 --- a/tests/file_toml.rs +++ b/tests/file_toml.rs @@ -80,11 +80,14 @@ fn test_error_parse() { let mut c = Config::default(); let res = c.merge(File::new("tests/Settings-invalid", FileFormat::Toml)); - let path_with_extension : PathBuf = ["tests", "Settings-invalid.toml"].iter().collect(); + let path_with_extension: PathBuf = ["tests", "Settings-invalid.toml"].iter().collect(); assert!(res.is_err()); assert_eq!( res.unwrap_err().to_string(), - format!("failed to parse datetime for key `error` at line 2 column 9 in {}", path_with_extension.display()) + format!( + "failed to parse datetime for key `error` at line 2 column 9 in {}", + path_with_extension.display() + ) ); } diff --git a/tests/file_yaml.rs b/tests/file_yaml.rs index 8f7814e..59174e6 100644 --- a/tests/file_yaml.rs +++ b/tests/file_yaml.rs @@ -70,12 +70,15 @@ fn test_error_parse() { let mut c = Config::default(); let res = c.merge(File::new("tests/Settings-invalid", FileFormat::Yaml)); - let path_with_extension : PathBuf = ["tests", "Settings-invalid.yaml"].iter().collect(); + let path_with_extension: PathBuf = ["tests", "Settings-invalid.yaml"].iter().collect(); assert!(res.is_err()); assert_eq!( res.unwrap_err().to_string(), - format!("while parsing a block mapping, did not find expected key at \ - line 2 column 1 in {}", path_with_extension.display()) + format!( + "while parsing a block mapping, did not find expected key at \ + line 2 column 1 in {}", + path_with_extension.display() + ) ); } diff --git a/tests/get.rs b/tests/get.rs index 64196e5..10ec066 100644 --- a/tests/get.rs +++ b/tests/get.rs @@ -224,7 +224,13 @@ fn test_enum() { assert_eq!(s.diodes["green"], Diode::Off); assert_eq!(s.diodes["red"], Diode::Brightness(100)); assert_eq!(s.diodes["blue"], Diode::Blinking(300, 700)); - assert_eq!(s.diodes["white"], Diode::Pattern{name: "christmas".into(), inifinite: true,}); + assert_eq!( + s.diodes["white"], + Diode::Pattern { + name: "christmas".into(), + inifinite: true, + } + ); } #[test] -- cgit v1.2.3