style: Make clippy happy

toml-rs · Oct 12, 2023 · 55f95c7 · 55f95c7
1 parent e597616
commit 55f95c7
Show file tree

Hide file tree

Showing 13 changed files with 35 additions and 68 deletions.
diff --git a/crates/toml/src/value.rs b/crates/toml/src/value.rs
@@ -812,7 +812,7 @@ impl<'de> serde::de::VariantAccess<'de> for MapEnumDeserializer {
                 }
             }
             Value::Table(values) => {
-                let tuple_values = values
+                let tuple_values: Result<Vec<_>, _> = values
                     .into_iter()
                     .enumerate()
                     .map(|(index, (key, value))| match key.parse::<usize>() {
@@ -822,17 +822,8 @@ impl<'de> serde::de::VariantAccess<'de> for MapEnumDeserializer {
                             index, key
                         ))),
                     })
-                    // Fold all values into a `Vec`, or return the first error.
-                    .fold(Ok(Vec::with_capacity(len)), |result, value_result| {
-                        result.and_then(move |mut tuple_values| match value_result {
-                            Ok(value) => {
-                                tuple_values.push(value);
-                                Ok(tuple_values)
-                            }
-                            // `Result<de::Value, Self::Error>` to `Result<Vec<_>, Self::Error>`
-                            Err(e) => Err(e),
-                        })
-                    })?;
+                    .collect();
+                let tuple_values = tuple_values?;
 
                 if tuple_values.len() == len {
                     serde::de::Deserializer::deserialize_seq(

diff --git a/crates/toml/tests/testsuite/pretty.rs b/crates/toml/tests/testsuite/pretty.rs
@@ -47,7 +47,7 @@ fn pretty_std() {
     assert_eq(toml, &result);
 }
 
-const PRETTY_TRICKY: &str = r##"[example]
+const PRETTY_TRICKY: &str = r#"[example]
 f = "\f"
 glass = """
 Nothing too unusual, except that I can eat glass in:
@@ -72,7 +72,7 @@ This has a ''' in it and \"\"\" cuz it's tricky yo
 Also ' and \" because why not
 this is the fourth line
 """
-"##;
+"#;
 
 #[test]
 fn pretty_tricky() {
@@ -85,7 +85,7 @@ fn pretty_tricky() {
     assert_eq(toml, &result);
 }
 
-const PRETTY_TABLE_ARRAY: &str = r##"[[array]]
+const PRETTY_TABLE_ARRAY: &str = r#"[[array]]
 key = "foo"
 
 [[array]]
@@ -96,7 +96,7 @@ doc = "this is a table"
 
 [example]
 single = "this is a single line string"
-"##;
+"#;
 
 #[test]
 fn pretty_table_array() {
@@ -109,7 +109,7 @@ fn pretty_table_array() {
     assert_eq(toml, &result);
 }
 
-const TABLE_ARRAY: &str = r##"[[array]]
+const TABLE_ARRAY: &str = r#"[[array]]
 key = "foo"
 
 [[array]]
@@ -120,7 +120,7 @@ doc = "this is a table"
 
 [example]
 single = "this is a single line string"
-"##;
+"#;
 
 #[test]
 fn table_array() {

diff --git a/crates/toml_datetime/src/datetime.rs b/crates/toml_datetime/src/datetime.rs
@@ -451,7 +451,7 @@ impl FromStr for Datetime {
 
 fn digit(chars: &mut str::Chars<'_>) -> Result<u8, DatetimeParseError> {
     match chars.next() {
-        Some(c) if ('0'..='9').contains(&c) => Ok(c as u8 - b'0'),
+        Some(c) if c.is_ascii_digit() => Ok(c as u8 - b'0'),
         _ => Err(DatetimeParseError {}),
     }
 }

diff --git a/crates/toml_edit/src/de/table_enum.rs b/crates/toml_edit/src/de/table_enum.rs
@@ -97,7 +97,7 @@ impl<'de> serde::de::VariantAccess<'de> for TableEnumDeserializer {
             }
             crate::Item::Table(values) => {
                 let values_span = values.span();
-                let tuple_values = values
+                let tuple_values: Result<Vec<_>, _> = values
                     .items
                     .into_iter()
                     .enumerate()
@@ -114,17 +114,8 @@ impl<'de> serde::de::VariantAccess<'de> for TableEnumDeserializer {
                             )),
                         },
                     )
-                    // Fold all values into a `Vec`, or return the first error.
-                    .fold(Ok(Vec::with_capacity(len)), |result, value_result| {
-                        result.and_then(move |mut tuple_values| match value_result {
-                            Ok(value) => {
-                                tuple_values.push(value);
-                                Ok(tuple_values)
-                            }
-                            // `Result<de::Value, Self::Error>` to `Result<Vec<_>, Self::Error>`
-                            Err(e) => Err(e),
-                        })
-                    })?;
+                    .collect();
+                let tuple_values = tuple_values?;
 
                 if tuple_values.len() == len {
                     serde::de::Deserializer::deserialize_seq(
@@ -140,7 +131,7 @@ impl<'de> serde::de::VariantAccess<'de> for TableEnumDeserializer {
             }
             crate::Item::Value(crate::Value::InlineTable(values)) => {
                 let values_span = values.span();
-                let tuple_values = values
+                let tuple_values: Result<Vec<_>, _> = values
                     .items
                     .into_iter()
                     .enumerate()
@@ -157,17 +148,8 @@ impl<'de> serde::de::VariantAccess<'de> for TableEnumDeserializer {
                             )),
                         },
                     )
-                    // Fold all values into a `Vec`, or return the first error.
-                    .fold(Ok(Vec::with_capacity(len)), |result, value_result| {
-                        result.and_then(move |mut tuple_values| match value_result {
-                            Ok(value) => {
-                                tuple_values.push(value);
-                                Ok(tuple_values)
-                            }
-                            // `Result<de::Value, Self::Error>` to `Result<Vec<_>, Self::Error>`
-                            Err(e) => Err(e),
-                        })
-                    })?;
+                    .collect();
+                let tuple_values = tuple_values?;
 
                 if tuple_values.len() == len {
                     serde::de::Deserializer::deserialize_seq(

diff --git a/crates/toml_edit/src/inline_table.rs b/crates/toml_edit/src/inline_table.rs
@@ -57,10 +57,10 @@ impl InlineTable {
         values
     }
 
-    pub(crate) fn append_values<'s, 'c>(
+    pub(crate) fn append_values<'s>(
         &'s self,
         parent: &[&'s Key],
-        values: &'c mut Vec<(Vec<&'s Key>, &'s Value)>,
+        values: &mut Vec<(Vec<&'s Key>, &'s Value)>,
     ) {
         for value in self.items.values() {
             let mut path = parent.to_vec();
@@ -467,7 +467,7 @@ fn decorate_inline_table(table: &mut InlineTable) {
     for (key_decor, value) in table
         .items
         .iter_mut()
-        .filter(|&(_, ref kv)| kv.value.is_value())
+        .filter(|(_, kv)| kv.value.is_value())
         .map(|(_, kv)| (&mut kv.key.decor, kv.value.as_value_mut().unwrap()))
     {
         key_decor.clear();

diff --git a/crates/toml_edit/src/item.rs b/crates/toml_edit/src/item.rs
@@ -7,9 +7,10 @@ use crate::table::TableLike;
 use crate::{Array, InlineTable, Table, Value};
 
 /// Type representing either a value, a table, an array of tables, or none.
-#[derive(Debug)]
+#[derive(Debug, Default)]
 pub enum Item {
     /// Type representing none.
+    #[default]
     None,
     /// Type representing value.
     Value(Value),
@@ -328,12 +329,6 @@ impl Clone for Item {
     }
 }
 
-impl Default for Item {
-    fn default() -> Self {
-        Item::None
-    }
-}
-
 impl FromStr for Item {
     type Err = crate::TomlError;
 

diff --git a/crates/toml_edit/src/parser/errors.rs b/crates/toml_edit/src/parser/errors.rs
@@ -166,7 +166,6 @@ fn translate_position(input: &[u8], index: usize) -> (usize, usize) {
         None => 0,
     };
     let line = input[0..line_start].iter().filter(|b| **b == b'\n').count();
-    let line = line;
 
     let column = std::str::from_utf8(&input[line_start..=index])
         .map(|s| s.chars().count() - 1)

diff --git a/crates/toml_edit/src/parser/key.rs b/crates/toml_edit/src/parser/key.rs
@@ -96,7 +96,7 @@ mod test {
         let cases = [
             ("a", "a"),
             (r#""hello\n ""#, "hello\n "),
-            (r#"'hello\n '"#, "hello\\n "),
+            (r"'hello\n '", "hello\\n "),
         ];
 
         for (input, expected) in cases {

diff --git a/crates/toml_edit/src/parser/state.rs b/crates/toml_edit/src/parser/state.rs
@@ -217,9 +217,9 @@ impl ParseState {
         Ok(())
     }
 
-    pub(crate) fn descend_path<'t, 'k>(
+    pub(crate) fn descend_path<'t>(
         mut table: &'t mut Table,
-        path: &'k [Key],
+        path: &[Key],
         dotted: bool,
     ) -> Result<&'t mut Table, CustomError> {
         for (i, key) in path.iter().enumerate() {

diff --git a/crates/toml_edit/src/parser/strings.rs b/crates/toml_edit/src/parser/strings.rs
@@ -440,10 +440,10 @@ The quick brown \
     #[test]
     fn literal_string() {
         let inputs = [
-            r#"'C:\Users\nodejs\templates'"#,
-            r#"'\\ServerX\admin$\system32\'"#,
+            r"'C:\Users\nodejs\templates'",
+            r"'\\ServerX\admin$\system32\'",
             r#"'Tom "Dubs" Preston-Werner'"#,
-            r#"'<\i\c*\s*>'"#,
+            r"'<\i\c*\s*>'",
         ];
 
         for input in &inputs {
@@ -456,7 +456,7 @@ The quick brown \
     #[test]
     fn ml_literal_string() {
         let inputs = [
-            r#"'''I [dw]on't need \d{2} apples'''"#,
+            r"'''I [dw]on't need \d{2} apples'''",
             r#"''''one_quote''''"#,
         ];
         for input in &inputs {

diff --git a/crates/toml_edit/src/parser/value.rs b/crates/toml_edit/src/parser/value.rs
@@ -131,7 +131,7 @@ mod test {
             "-239",
             "1e200",
             "9_224_617.445_991_228_313",
-            r#"'''I [dw]on't need \d{2} apples'''"#,
+            r"'''I [dw]on't need \d{2} apples'''",
             r#"'''
 The first newline is
 trimmed in raw strings.

diff --git a/crates/toml_edit/src/table.rs b/crates/toml_edit/src/table.rs
@@ -70,10 +70,10 @@ impl Table {
         values
     }
 
-    fn append_values<'s, 'c>(
+    fn append_values<'s>(
         &'s self,
         parent: &[&'s Key],
-        values: &'c mut Vec<(Vec<&'s Key>, &'s Value)>,
+        values: &mut Vec<(Vec<&'s Key>, &'s Value)>,
     ) {
         for value in self.items.values() {
             let mut path = parent.to_vec();
@@ -474,7 +474,7 @@ fn decorate_table(table: &mut Table) {
     for (key_decor, value) in table
         .items
         .iter_mut()
-        .filter(|&(_, ref kv)| kv.value.is_value())
+        .filter(|(_, kv)| kv.value.is_value())
         .map(|(_, kv)| (&mut kv.key.decor, kv.value.as_value_mut().unwrap()))
     {
         key_decor.clear();

diff --git a/crates/toml_edit/tests/testsuite/parse.rs b/crates/toml_edit/tests/testsuite/parse.rs
@@ -56,11 +56,11 @@ multiline basic string
 """"#
     )
     .is_str());
-    assert!(parse_value!(r#"'literal string\ \'"#).is_str());
+    assert!(parse_value!(r"'literal string\ \'").is_str());
     assert!(parse_value!(
-        r#"'''multiline
+        r"'''multiline
 literal \ \
-string'''"#
+string'''"
     )
     .is_str());
     assert!(parse_value!(r#"{ hello = "world", a = 1}"#).is_inline_table());