Cargo update and cargo clippy

Author: topecongiro

Cargo.lock

@@ -48,8 +48,8 @@ env_logger = "0.5"
 getopts = "0.2"
 derive-new = "0.5"
 cargo_metadata = "0.5"
-rustc-ap-syntax = "57.0.0"
-rustc-ap-rustc_errors = "57.0.0"
+rustc-ap-syntax = "60.0.0"
+rustc-ap-rustc_errors = "60.0.0"
 
 [dev-dependencies]
 lazy_static = "1.0.0"

Cargo.toml

@@ -335,7 +335,7 @@ fn execute(opts: &Options) -> FmtResult<Summary> {
 }
 
 fn main() {
-    let _ = env_logger::init();
+    env_logger::init();
 
     let opts = make_opts();
 

src/bin/main.rs

@@ -1044,14 +1044,12 @@ impl<'a> ControlFlow<'a> {
                 .span_after(mk_sp(lo, self.span.hi()), self.keyword.trim()),
             if self.pats.is_empty() {
                 cond_span.lo()
+            } else if self.matcher.is_empty() {
+                self.pats[0].span.lo()
             } else {
-                if self.matcher.is_empty() {
-                    self.pats[0].span.lo()
-                } else {
-                    context
-                        .snippet_provider
-                        .span_before(self.span, self.matcher.trim())
-                }
+                context
+                    .snippet_provider
+                    .span_before(self.span, self.matcher.trim())
             },
         );
 
@@ -1268,7 +1266,7 @@ pub fn is_unsafe_block(block: &ast::Block) -> bool {
     }
 }
 
-/// A simple wrapper type against ast::Arm. Used inside write_list().
+/// A simple wrapper type against `ast::Arm`. Used inside `write_list()`.
 struct ArmWrapper<'a> {
     pub arm: &'a ast::Arm,
     /// True if the arm is the last one in match expression. Used to decide on whether we should add
@@ -1787,7 +1785,7 @@ fn rewrite_multiple_patterns(
         separator: " |",
         trailing_separator: SeparatorTactic::Never,
         separator_place: context.config.binop_separator(),
-        shape: shape,
+        shape,
         ends_with_newline: false,
         preserve_newline: false,
         config: context.config,

src/expr.rs

@@ -81,7 +81,7 @@ impl From<io::Error> for FormatDiffError {
 }
 
 fn main() {
-    let _ = env_logger::init();
+    env_logger::init();
 
     let mut opts = getopts::Options::new();
     opts.optflag("h", "help", "show this message");

src/format-diff/main.rs

@@ -184,7 +184,7 @@ impl Config {
 }
 
 fn main() {
-    let _ = env_logger::init();
+    env_logger::init();
 
     let opts = make_opts();
     let matches = opts.parse(env::args().skip(1))

src/git-rustfmt/main.rs

@@ -798,7 +798,7 @@ pub fn get_modified_lines(
 
     let mut config = config.clone();
     config.set().write_mode(config::WriteMode::Modified);
-    let (summary, filemap, formatreport) = format_input(input, &config, Some(&mut data))?;
+    let (summary, filemap, report) = format_input(input, &config, Some(&mut data))?;
 
     let mut lines = data.lines();
     let mut chunks = Vec::new();
@@ -823,9 +823,9 @@ pub fn get_modified_lines(
         });
     }
     Ok(ModifiedLinesResult {
-        summary: summary,
-        filemap: filemap,
-        report: formatreport,
+        summary,
+        filemap,
+        report,
         modified_lines: ModifiedLines { chunks },
     })
 }