summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Orchard <if_coding@fastmail.com>2021-08-09 00:57:03 -0700
committerDavid Orchard <if_coding@fastmail.com>2021-08-09 00:57:03 -0700
commit2dc2457c286208b35ac1dc1226e2caa40763dc25 (patch)
tree70dc9fb2f007ca3dd5df24dda1355501085f1313
parent44d8ce79ff3900acf69040e63f3c299a576dc106 (diff)
Run rustfmtpr-217
-rw-r--r--src/builder.rs2
-rw-r--r--src/value.rs2
-rw-r--r--tests/file_json.rs5
-rw-r--r--tests/file_json5.rs5
-rw-r--r--tests/file_ron.rs5
-rw-r--r--tests/file_toml.rs5
-rw-r--r--tests/file_yaml.rs5
-rw-r--r--tests/legacy/file_json.rs5
-rw-r--r--tests/legacy/file_ron.rs5
-rw-r--r--tests/legacy/file_toml.rs5
-rw-r--r--tests/legacy/file_yaml.rs5
11 files changed, 38 insertions, 11 deletions
diff --git a/src/builder.rs b/src/builder.rs
index 3a5d524..e629606 100644
--- a/src/builder.rs
+++ b/src/builder.rs
@@ -1,5 +1,5 @@
-use std::str::FromStr;
use std::iter::IntoIterator;
+use std::str::FromStr;
use crate::error::Result;
use crate::map::Map;
diff --git a/src/value.rs b/src/value.rs
index efd9ebe..1523c1e 100644
--- a/src/value.rs
+++ b/src/value.rs
@@ -3,8 +3,8 @@ use std::fmt::Display;
use serde::de::{Deserialize, Deserializer, Visitor};
-use crate::map::Map;
use crate::error::*;
+use crate::map::Map;
/// Underlying kind of the configuration value.
///
diff --git a/tests/file_json.rs b/tests/file_json.rs
index 7730f92..d3fa0a9 100644
--- a/tests/file_json.rs
+++ b/tests/file_json.rs
@@ -60,7 +60,10 @@ fn test_file() {
assert_eq!(s.elements[3], "4".to_string());
if cfg!(feature = "preserve_order") {
assert_eq!(
- s.place.creator.into_iter().collect::<Vec<(String, config::Value)>>(),
+ s.place
+ .creator
+ .into_iter()
+ .collect::<Vec<(String, config::Value)>>(),
vec![
("name".to_string(), "John Smith".into()),
("username".into(), "jsmith".into()),
diff --git a/tests/file_json5.rs b/tests/file_json5.rs
index 9f8e499..a768bba 100644
--- a/tests/file_json5.rs
+++ b/tests/file_json5.rs
@@ -59,7 +59,10 @@ fn test_file() {
assert_eq!(s.elements[3], "4".to_string());
if cfg!(feature = "preserve_order") {
assert_eq!(
- s.place.creator.into_iter().collect::<Vec<(String, config::Value)>>(),
+ s.place
+ .creator
+ .into_iter()
+ .collect::<Vec<(String, config::Value)>>(),
vec![
("name".to_string(), "John Smith".into()),
("username".into(), "jsmith".into()),
diff --git a/tests/file_ron.rs b/tests/file_ron.rs
index 1ac35ac..32c7192 100644
--- a/tests/file_ron.rs
+++ b/tests/file_ron.rs
@@ -62,7 +62,10 @@ fn test_file() {
assert_eq!(s.elements[3], "4".to_string());
if cfg!(feature = "preserve_order") {
assert_eq!(
- s.place.creator.into_iter().collect::<Vec<(String, config::Value)>>(),
+ s.place
+ .creator
+ .into_iter()
+ .collect::<Vec<(String, config::Value)>>(),
vec![
("name".to_string(), "John Smith".into()),
("username".into(), "jsmith".into()),
diff --git a/tests/file_toml.rs b/tests/file_toml.rs
index 7aa0020..b6bb537 100644
--- a/tests/file_toml.rs
+++ b/tests/file_toml.rs
@@ -71,7 +71,10 @@ fn test_file() {
assert_eq!(s.elements[3], "4".to_string());
if cfg!(feature = "preserve_order") {
assert_eq!(
- s.place.creator.into_iter().collect::<Vec<(String, config::Value)>>(),
+ s.place
+ .creator
+ .into_iter()
+ .collect::<Vec<(String, config::Value)>>(),
vec![
("name".to_string(), "John Smith".into()),
("username".into(), "jsmith".into()),
diff --git a/tests/file_yaml.rs b/tests/file_yaml.rs
index 063ad25..c87d5e9 100644
--- a/tests/file_yaml.rs
+++ b/tests/file_yaml.rs
@@ -60,7 +60,10 @@ fn test_file() {
assert_eq!(s.elements[3], "4".to_string());
if cfg!(feature = "preserve_order") {
assert_eq!(
- s.place.creator.into_iter().collect::<Vec<(String, config::Value)>>(),
+ s.place
+ .creator
+ .into_iter()
+ .collect::<Vec<(String, config::Value)>>(),
vec![
("name".to_string(), "John Smith".into()),
("username".into(), "jsmith".into()),
diff --git a/tests/legacy/file_json.rs b/tests/legacy/file_json.rs
index 6acf53a..b2294b0 100644
--- a/tests/legacy/file_json.rs
+++ b/tests/legacy/file_json.rs
@@ -58,7 +58,10 @@ fn test_file() {
assert_eq!(s.elements[3], "4".to_string());
if cfg!(feature = "preserve_order") {
assert_eq!(
- s.place.creator.into_iter().collect::<Vec<(String, config::Value)>>(),
+ s.place
+ .creator
+ .into_iter()
+ .collect::<Vec<(String, config::Value)>>(),
vec![
("name".to_string(), "John Smith".into()),
("username".into(), "jsmith".into()),
diff --git a/tests/legacy/file_ron.rs b/tests/legacy/file_ron.rs
index 299f688..ea8bc27 100644
--- a/tests/legacy/file_ron.rs
+++ b/tests/legacy/file_ron.rs
@@ -60,7 +60,10 @@ fn test_file() {
assert_eq!(s.elements[3], "4".to_string());
if cfg!(feature = "preserve_order") {
assert_eq!(
- s.place.creator.into_iter().collect::<Vec<(String, config::Value)>>(),
+ s.place
+ .creator
+ .into_iter()
+ .collect::<Vec<(String, config::Value)>>(),
vec![
("name".to_string(), "John Smith".into()),
("username".into(), "jsmith".into()),
diff --git a/tests/legacy/file_toml.rs b/tests/legacy/file_toml.rs
index e9453f6..b8a1337 100644
--- a/tests/legacy/file_toml.rs
+++ b/tests/legacy/file_toml.rs
@@ -69,7 +69,10 @@ fn test_file() {
assert_eq!(s.elements[3], "4".to_string());
if cfg!(feature = "preserve_order") {
assert_eq!(
- s.place.creator.into_iter().collect::<Vec<(String, config::Value)>>(),
+ s.place
+ .creator
+ .into_iter()
+ .collect::<Vec<(String, config::Value)>>(),
vec![
("name".to_string(), "John Smith".into()),
("username".into(), "jsmith".into()),
diff --git a/tests/legacy/file_yaml.rs b/tests/legacy/file_yaml.rs
index 45e3e06..818518b 100644
--- a/tests/legacy/file_yaml.rs
+++ b/tests/legacy/file_yaml.rs
@@ -58,7 +58,10 @@ fn test_file() {
assert_eq!(s.elements[3], "4".to_string());
if cfg!(feature = "preserve_order") {
assert_eq!(
- s.place.creator.into_iter().collect::<Vec<(String, config::Value)>>(),
+ s.place
+ .creator
+ .into_iter()
+ .collect::<Vec<(String, config::Value)>>(),
vec![
("name".to_string(), "John Smith".into()),
("username".into(), "jsmith".into()),