Fixed fmt and nightly

resources/test/fixtures/pyupgrade/UP035.py

@@ -1,4 +1,3 @@
-# from builtins import *
 if True:
     from collections import (
         Mapping,

src/rules/pyupgrade/rules/import_replacements.rs

@@ -1,10 +1,11 @@
+use rustpython_ast::{AliasData, Located, Stmt};
+
 use crate::ast::types::Range;
 use crate::ast::whitespace::indentation;
 use crate::checkers::ast::Checker;
 use crate::fix::Fix;
 use crate::registry::{Diagnostic, Rule};
 use crate::violations;
-use rustpython_ast::{AliasData, Located, Stmt};
 
 const BAD_MODULES: &[&str] = &[
     "collections",
@@ -66,14 +67,14 @@ impl<'a> FixImports<'a> {
             multi_line,
             names,
             indent,
-            short_indent
+            short_indent,
         }
     }
 
     fn check_replacement(&self) -> Option<String> {
         match self.module {
             "collections" => self.create_new_str(COLLECTIONS_TO_ABC, "collections.abc"),
-            _ => return None,
+            _ => None,
         }
     }
 
@@ -93,7 +94,8 @@ impl<'a> FixImports<'a> {
         }
     }
 
-    /// Returns a list of imports that does and does not have a match in the given list of matches
+    /// Returns a list of imports that does and does not have a match in the
+    /// given list of matches
     fn get_import_lists(&self, matches: &[&str]) -> (Vec<AliasData>, Vec<AliasData>) {
         let mut unmatching_names: Vec<AliasData> = vec![];
         let mut matching_names: Vec<AliasData> = vec![];
@@ -117,7 +119,7 @@ impl<'a> FixImports<'a> {
         let after_imps = if self.multi_line {
             format!("\n{})", self.short_indent)
         } else {
-            "".to_string()
+            String::new()
         };
         let mut full_names: Vec<String> = vec![];
         for name in names {
@@ -145,7 +147,8 @@ pub fn import_replacements(
     names: &Vec<Located<AliasData>>,
     module: &Option<String>,
 ) {
-    // Pyupgrade only works with import_from statements, so this linter does that as well
+    // Pyupgrade only works with import_from statements, so this linter does that as
+    // well
     let clean_mod = match module {
         None => return,
         Some(item) => item,

src/rules/pyupgrade/rules/mod.rs

@@ -6,6 +6,7 @@ pub(crate) use extraneous_parentheses::extraneous_parentheses;
 pub(crate) use f_strings::f_strings;
 pub(crate) use format_literals::format_literals;
 pub(crate) use functools_cache::functools_cache;
+pub(crate) use import_replacements::import_replacements;
 pub(crate) use lru_cache_without_parameters::lru_cache_without_parameters;
 pub(crate) use native_literals::native_literals;
 use once_cell::sync::Lazy;
@@ -33,7 +34,6 @@ pub(crate) use use_pep585_annotation::use_pep585_annotation;
 pub(crate) use use_pep604_annotation::use_pep604_annotation;
 pub(crate) use useless_metaclass_type::useless_metaclass_type;
 pub(crate) use useless_object_inheritance::useless_object_inheritance;
-pub(crate) use import_replacements::import_replacements;
 
 use crate::ast::helpers;
 use crate::ast::types::{Range, Scope, ScopeKind};
@@ -49,6 +49,7 @@ mod extraneous_parentheses;
 mod f_strings;
 mod format_literals;
 mod functools_cache;
+mod import_replacements;
 mod lru_cache_without_parameters;
 mod native_literals;
 mod open_alias;
@@ -72,7 +73,6 @@ mod use_pep585_annotation;
 mod use_pep604_annotation;
 mod useless_metaclass_type;
 mod useless_object_inheritance;
-mod import_replacements;
 
 /// UP008
 pub fn super_args(