From eebc699a88295bff575e678e3032288c24a23968 Mon Sep 17 00:00:00 2001
From: Pascal Hertleif <killercup@gmail.com>
Date: Sun, 13 May 2018 17:26:00 +0200
Subject: [PATCH] Update lint group names

Fixes usage on a nightly after https://github.com/rust-lang/rust/pull/50620
---
 cargo-fix/src/cli.rs                   | 2 +-
 cargo-fix/src/main.rs                  | 2 +-
 cargo-fix/tests/all/edition_upgrade.rs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cargo-fix/src/cli.rs b/cargo-fix/src/cli.rs
index c8b2260..aaca723 100644
--- a/cargo-fix/src/cli.rs
+++ b/cargo-fix/src/cli.rs
@@ -89,7 +89,7 @@ pub fn run() -> Result<(), Error> {
     if let Some("2018") = matches.value_of("edition") {
         info!("edition upgrade!");
         let mut rustc_flags = env::var_os("RUSTFLAGS").unwrap_or_else(|| "".into());
-        rustc_flags.push("-W rust-2018-breakage");
+        rustc_flags.push("-W rust_2018_compatibility");
         cmd.env("RUSTFLAGS", &rustc_flags);
     }
 
diff --git a/cargo-fix/src/main.rs b/cargo-fix/src/main.rs
index c54bd37..edf1221 100644
--- a/cargo-fix/src/main.rs
+++ b/cargo-fix/src/main.rs
@@ -197,7 +197,7 @@ fn rustfix_crate(rustc: &Path, filename: &str) -> Result<FixedCrate, Error> {
             .iter()
             .all(|s| s.file_name == file_name && s.line_range == range)
         {
-            trace!("rejecting as it spans mutliple files {:?}", suggestion);
+            trace!("rejecting as it spans multiple files {:?}", suggestion);
             continue;
         }
 
diff --git a/cargo-fix/tests/all/edition_upgrade.rs b/cargo-fix/tests/all/edition_upgrade.rs
index dba728e..f66e7f0 100644
--- a/cargo-fix/tests/all/edition_upgrade.rs
+++ b/cargo-fix/tests/all/edition_upgrade.rs
@@ -131,7 +131,7 @@ fn upgrade_extern_crate() {
         .file(
             "src/lib.rs",
             r#"
-                #![warn(rust_2018_migration)]
+                #![warn(rust_2018_idioms)]
 
                 extern crate bar;