Merge pull request #3504 from matthiaskrgr/clippy_2

fix a bunch of clippy warnings

Author: scampi

src/chains.rs

@@ -550,7 +550,7 @@ impl<'a> ChainFormatterShared<'a> {
         let almost_total = if extendable {
             prev_last_line_width
         } else {
-            self.rewrites.iter().map(|a| a.len()).sum()
+            self.rewrites.iter().map(String::len).sum()
         } + last.tries;
         let one_line_budget = if self.child_count == 1 {
             shape.width

src/closures.rs

@@ -353,7 +353,7 @@ pub fn rewrite_last_closure(
 /// Returns `true` if the given vector of arguments has more than one `ast::ExprKind::Closure`.
 pub fn args_have_many_closure(args: &[OverflowableItem<'_>]) -> bool {
     args.iter()
-        .filter_map(|arg| arg.to_expr())
+        .filter_map(OverflowableItem::to_expr)
         .filter(|expr| match expr.node {
             ast::ExprKind::Closure(..) => true,
             _ => false,

src/comment.rs

@@ -1243,7 +1243,7 @@ where
             },
             CharClassesStatus::LitCharEscape => CharClassesStatus::LitChar,
             CharClassesStatus::Normal => match chr {
-                'r' => match self.base.peek().map(|c| c.get_char()) {
+                'r' => match self.base.peek().map(RichChar::get_char) {
                     Some('#') | Some('"') => {
                         char_kind = FullCodeCharKind::InString;
                         CharClassesStatus::RawStringPrefix(0)

src/config/file_lines.rs

@@ -191,7 +191,7 @@ impl FileLines {
 
     /// Returns an iterator over the files contained in `self`.
     pub fn files(&self) -> Files<'_> {
-        Files(self.0.as_ref().map(|m| m.keys()))
+        Files(self.0.as_ref().map(HashMap::keys))
     }
 
     /// Returns JSON representation as accepted by the `--file-lines JSON` arg.

src/config/mod.rs

@@ -244,7 +244,7 @@ impl Config {
                 }
             }
 
-            return Ok(None);
+            Ok(None)
         }
 
         match resolve_project_file(dir)? {
@@ -260,7 +260,7 @@ impl Config {
         let mut err = String::new();
         let table = parsed
             .as_table()
-            .ok_or(String::from("Parsed config was not table"))?;
+            .ok_or_else(|| String::from("Parsed config was not table"))?;
         for key in table.keys() {
             if !Config::is_valid_name(key) {
                 let msg = &format!("Warning: Unknown configuration option `{}`\n", key);
@@ -358,7 +358,7 @@ fn config_path(options: &dyn CliOptions) -> Result<Option<PathBuf>, Error> {
                 config_path_not_found(path.to_str().unwrap())
             }
         }
-        path => Ok(path.map(|p| p.to_owned())),
+        path => Ok(path.map(ToOwned::to_owned)),
     }
 }
 

src/formatting.rs

@@ -263,7 +263,7 @@ impl FormattingError {
                 .and_then(|fl| {
                     fl.file
                         .get_line(fl.lines[0].line_index)
-                        .map(|l| l.into_owned())
+                        .map(std::borrow::Cow::into_owned)
                 })
                 .unwrap_or_else(String::new),
         }
@@ -653,7 +653,7 @@ fn parse_crate(
                 return Ok(c);
             }
         }
-        Ok(Err(mut diagnostics)) => diagnostics.iter_mut().for_each(|d| d.emit()),
+        Ok(Err(mut diagnostics)) => diagnostics.iter_mut().for_each(DiagnosticBuilder::emit),
         Err(_) => {
             // Note that if you see this message and want more information,
             // then run the `parse_crate_mod` function above without

src/git-rustfmt/main.rs

@@ -98,7 +98,7 @@ fn uncommitted_files() -> Vec<String> {
     stdout
         .lines()
         .filter(|s| s.ends_with(".rs"))
-        .map(|s| s.to_owned())
+        .map(std::borrow::ToOwned::to_owned)
         .collect()
 }
 

src/imports.rs

@@ -492,10 +492,7 @@ impl UseTree {
 
         // Recursively normalize elements of a list use (including sorting the list).
         if let UseSegment::List(list) = last {
-            let mut list = list
-                .into_iter()
-                .map(|ut| ut.normalize())
-                .collect::<Vec<_>>();
+            let mut list = list.into_iter().map(UseTree::normalize).collect::<Vec<_>>();
             list.sort();
             last = UseSegment::List(list);
         }

src/items.rs

@@ -1358,7 +1358,7 @@ fn format_tuple_struct(
         context
             .snippet_provider
             .opt_span_after(mk_sp(last_arg_span.hi(), span.hi()), ")")
-            .unwrap_or(last_arg_span.hi())
+            .unwrap_or_else(|| last_arg_span.hi())
     };
 
     let where_clause_str = match struct_parts.generics {
@@ -2143,7 +2143,7 @@ fn rewrite_fn_base(
             indent
         } else {
             if context.config.version() == Version::Two {
-                if arg_str.len() != 0 || !no_args_and_over_max_width {
+                if !arg_str.is_empty() || !no_args_and_over_max_width {
                     result.push(' ');
                 }
             } else {
@@ -2284,7 +2284,7 @@ fn rewrite_args(
     span: Span,
     variadic: bool,
 ) -> Option<String> {
-    if args.len() == 0 {
+    if args.is_empty() {
         let comment = context
             .snippet(mk_sp(
                 span.lo(),

src/lib.rs

@@ -445,7 +445,7 @@ fn format_code_block(code_snippet: &str, config: &Config) -> Option<FormattedSni
     let block_len = formatted
         .snippet
         .rfind('}')
-        .unwrap_or(formatted.snippet.len());
+        .unwrap_or_else(|| formatted.snippet.len());
     let mut is_indented = true;
     for (kind, ref line) in LineClasses::new(&formatted.snippet[FN_MAIN_PREFIX.len()..block_len]) {
         if !is_first {