Run clippy and fixes after merge main

astral-sh · Feb 5, 2023 · 3b6438f · 3b6438f
1 parent 23a9343
commit 3b6438f
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 13 deletions.
diff --git a/ruff_cli/src/args.rs b/ruff_cli/src/args.rs
@@ -453,7 +453,7 @@ impl ConfigProcessor for &Overrides {
                 .ignore
                 .iter()
                 .cloned()
-                .chain(self.extend_ignore.iter().cloned().into_iter())
+                .chain(self.extend_ignore.iter().cloned())
                 .flatten()
                 .collect(),
             extend_select: self.extend_select.clone().unwrap_or_default(),

diff --git a/src/registry.rs b/src/registry.rs
@@ -794,7 +794,7 @@ mod tests {
         for rule in Rule::iter() {
             let code = rule.code();
             let (linter, rest) =
-                Linter::parse_code(code).unwrap_or_else(|| panic!("couldn't parse {:?}", code));
+                Linter::parse_code(code).unwrap_or_else(|| panic!("couldn't parse {code:?}"));
             assert_eq!(code, format!("{}{rest}", linter.common_prefix()));
         }
     }

diff --git a/src/rules/flake8_bugbear/rules/unused_loop_control_variable.rs b/src/rules/flake8_bugbear/rules/unused_loop_control_variable.rs
@@ -174,12 +174,7 @@ pub fn unused_loop_control_variable(
                 let scope = checker.current_scope();
                 if let Some(binding) = iter::once(scope.bindings.get(name))
                     .flatten()
-                    .chain(
-                        iter::once(scope.rebounds.get(name))
-                            .flatten()
-                            .into_iter()
-                            .flatten(),
-                    )
+                    .chain(iter::once(scope.rebounds.get(name)).flatten().flatten())
                     .find_map(|index| {
                         let binding = &checker.bindings[*index];
                         if let Some(source) = &binding.source {

diff --git a/src/rules/flake8_django/mod.rs b/src/rules/flake8_django/mod.rs
@@ -8,8 +8,8 @@ mod tests {
     use anyhow::Result;
     use test_case::test_case;
 
-    use crate::linter::test_path;
     use crate::registry::Rule;
+    use crate::test::test_path;
     use crate::{assert_yaml_snapshot, settings};
 
     #[test_case(Rule::ModelDunderStr, Path::new("DJ08.py"); "DJ08")]

diff --git a/src/rules/flake8_django/rules.rs b/src/rules/flake8_django/rules.rs
@@ -126,7 +126,7 @@ impl Violation for ModelStringFieldNullable {
         format!("Avoid using null=True on string-based fields such as {field}.")
     }
 }
-const NOT_NULL_TRUE_FIELDS: [&'static str; 6] = [
+const NOT_NULL_TRUE_FIELDS: [&str; 6] = [
     "CharField",
     "TextField",
     "SlugField",
@@ -137,7 +137,7 @@ const NOT_NULL_TRUE_FIELDS: [&'static str; 6] = [
 impl ModelStringFieldNullable {
     pub fn check(bases: &[Expr], body: &[Stmt]) -> Vec<Diagnostic> {
         let mut errors = Vec::new();
-        if !bases.iter().any(|val| is_model(val)) {
+        if !bases.iter().any(is_model) {
             return errors;
         }
         for statement in body.iter() {
@@ -154,7 +154,7 @@ impl ModelStringFieldNullable {
         errors
     }
 
-    fn check_nullable_field(value: &Box<Expr>) -> Option<&str> {
+    fn check_nullable_field(value: &Expr) -> Option<&str> {
         let Call {func, keywords, ..} = &value.node else {
            return None;
         };

diff --git a/src/rules/flake8_self/rules/private_member_access.rs b/src/rules/flake8_self/rules/private_member_access.rs
@@ -35,7 +35,7 @@ pub fn private_member_access(checker: &mut Checker, expr: &Expr) {
             if !VALID_IDS.contains(&id.as_str()) {
                 checker.diagnostics.push(Diagnostic::new(
                     PrivateMemberAccess {
-                        access: format!("{}.{}", id, attr),
+                        access: format!("{id}.{attr}"),
                     },
                     Range::from_located(expr),
                 ));