Merge pull request #112 from matthiaskrgr/fix_RUSTFLAGS_prepare_for

cli: fix injection of --prepare-for flags

Author: killercup

cargo-fix/src/cli.rs

@@ -104,7 +104,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-compatibility");
+        rustc_flags.push(" -W rust-2018-compatibility");
         cmd.env("RUSTFLAGS", &rustc_flags);
     }
 

cargo-fix/tests/all/main.rs

@@ -356,6 +356,7 @@ mod broken_build;
 mod broken_lints;
 mod dependencies;
 mod edition_upgrade;
+mod rust_flags;
 mod smoke;
 mod subtargets;
 mod vcs;

cargo-fix/tests/all/rust_flags.rs

@@ -0,0 +1,34 @@
+use super::project;
+
+#[test]
+fn specify_rustflags() {
+    let p = project()
+        .file(
+            "src/lib.rs",
+            r#"
+                #![allow(unused)]
+                #![feature(rust_2018_preview)]
+
+                mod foo {
+                    pub const FOO: &str = "fooo";
+                }
+
+                fn main() {
+                    let x = ::foo::FOO;
+                }
+            "#,
+        )
+        .build();
+
+    let stderr = "\
+[CHECKING] foo v0.1.0 (CWD)
+[FIXING] src/lib.rs (1 fix)
+[FINISHED] dev [unoptimized + debuginfo]
+";
+
+    p.expect_cmd("cargo-fix fix --prepare-for 2018")
+        .env("RUSTFLAGS", "-C target-cpu=native")
+        .stdout("")
+        .stderr(stderr)
+        .run();
+}

cargo-fix/tests/all/smoke.rs

@@ -105,9 +105,7 @@ fn preserve_line_endings() {
         )
         .build();
 
-    p.expect_cmd("cargo-fix fix")
-        .fix_everything()
-        .run();
+    p.expect_cmd("cargo-fix fix").fix_everything().run();
     assert!(p.read("src/lib.rs").contains("\r\n"));
 }
 
@@ -123,9 +121,7 @@ fn fix_deny_warnings() {
         )
         .build();
 
-    p.expect_cmd("cargo-fix fix")
-        .fix_everything()
-        .run();
+    p.expect_cmd("cargo-fix fix").fix_everything().run();
 }
 
 #[test]
@@ -146,9 +142,7 @@ fn fix_deny_warnings_but_not_others() {
         )
         .build();
 
-    p.expect_cmd("cargo-fix fix")
-        .fix_everything()
-        .run();
+    p.expect_cmd("cargo-fix fix").fix_everything().run();
     assert!(!p.read("src/lib.rs").contains("let mut x = 3;"));
     assert!(p.read("src/lib.rs").contains("fn bar() {}"));
 }

src/replace.rs

@@ -14,7 +14,7 @@ enum State {
 
 impl State {
     fn is_inserted(&self) -> bool {
-        if let &State::Inserted(..) = self {
+        if let State::Inserted(..) = *self {
             true
         } else {
             false
@@ -26,7 +26,7 @@ impl State {
 struct Span {
     /// Start of this span in parent data
     start: usize,
-    /// up to end inculding
+    /// up to end including
     end: usize,
     data: State,
 }