Clippy

MathiasPius · May 29, 2023 · 03315aa · 03315aa
1 parent 2dbeb42
commit 03315aa
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 15 deletions.
diff --git a/yaml-validator-cli/src/error.rs b/yaml-validator-cli/src/error.rs
@@ -26,7 +26,7 @@ impl<'a> From<SchemaError<'a>> for Error {
     }
 }
 
-impl<'a> std::fmt::Display for Error {
+impl std::fmt::Display for Error {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             Error::File(e) => write!(f, "{}", e),

diff --git a/yaml-validator/Cargo.toml b/yaml-validator/Cargo.toml
@@ -16,4 +16,7 @@ regex = { "version" = "1.5.4", optional = true }
 smallvec = { "version" = "1.8.0", optional = true }
 
 [features]
-default = ["regex", "smallvec"]
+default = ["regex", "smallvec"]
+regex = ["dep:regex"]
+smallvec = ["dep:smallvec"]
+
diff --git a/yaml-validator/src/types/array.rs b/yaml-validator/src/types/array.rs
@@ -255,8 +255,7 @@ mod tests {
                 expected: "hash",
                 actual: "array"
             }
-            .with_path_name("items")
-            .into(),
+            .with_path_name("items"),
         );
     }
 

diff --git a/yaml-validator/src/types/hash.rs b/yaml-validator/src/types/hash.rs
@@ -102,8 +102,7 @@ mod tests {
                 expected: "hash",
                 actual: "array"
             }
-            .with_path_name("items")
-            .into(),
+            .with_path_name("items"),
         );
     }
 

diff --git a/yaml-validator/src/types/integer.rs b/yaml-validator/src/types/integer.rs
@@ -309,7 +309,7 @@ mod tests {
                 .validate(&Context::default(), &load_simple("10"))
                 .unwrap_err(),
             ValidationErrorKind::ValidationError {
-                error: "value violates lower limit constraint".into()
+                error: "value violates lower limit constraint"
             }
             .into()
         );
@@ -345,7 +345,7 @@ mod tests {
                 .validate(&Context::default(), &load_simple("5"))
                 .unwrap_err(),
             ValidationErrorKind::ValidationError {
-                error: "value violates lower limit constraint".into()
+                error: "value violates lower limit constraint"
             }
             .into()
         );
@@ -366,7 +366,7 @@ mod tests {
                 .validate(&Context::default(), &load_simple("10"))
                 .unwrap_err(),
             ValidationErrorKind::ValidationError {
-                error: "value violates upper limit constraint".into()
+                error: "value violates upper limit constraint"
             }
             .into()
         );
@@ -402,7 +402,7 @@ mod tests {
                 .validate(&Context::default(), &load_simple("20"))
                 .unwrap_err(),
             ValidationErrorKind::ValidationError {
-                error: "value violates upper limit constraint".into()
+                error: "value violates upper limit constraint"
             }
             .into()
         );

diff --git a/yaml-validator/src/types/real.rs b/yaml-validator/src/types/real.rs
@@ -309,7 +309,7 @@ mod tests {
                 .validate(&Context::default(), &load_simple("10.0"))
                 .unwrap_err(),
             ValidationErrorKind::ValidationError {
-                error: "value violates lower limit constraint".into()
+                error: "value violates lower limit constraint"
             }
             .into()
         );
@@ -345,7 +345,7 @@ mod tests {
                 .validate(&Context::default(), &load_simple("5.0"))
                 .unwrap_err(),
             ValidationErrorKind::ValidationError {
-                error: "value violates lower limit constraint".into()
+                error: "value violates lower limit constraint"
             }
             .into()
         );
@@ -366,7 +366,7 @@ mod tests {
                 .validate(&Context::default(), &load_simple("10.0"))
                 .unwrap_err(),
             ValidationErrorKind::ValidationError {
-                error: "value violates upper limit constraint".into()
+                error: "value violates upper limit constraint"
             }
             .into()
         );

diff --git a/yaml-validator/src/utils.rs b/yaml-validator/src/utils.rs
@@ -165,7 +165,7 @@ impl YamlUtils for Yaml {
         let missing = required
             .iter()
             .filter(|field| !hash.contains_key(&Yaml::String((**field).to_string())))
-            .map(|field| GenericError::FieldMissing { field: *field });
+            .map(|field| GenericError::FieldMissing { field });
 
         let extra = hash
             .keys()
@@ -256,7 +256,7 @@ pub trait CondenseErrors<T>: Sized {
     fn condense_errors(results: &mut dyn Iterator<Item = Result<T, Self>>) -> Result<Vec<T>, Self>;
 }
 
-impl<'a, T, E> CondenseErrors<T> for E
+impl<T, E> CondenseErrors<T> for E
 where
     T: Debug,
     E: From<Vec<Self>> + Debug,