Merge rust-lang#39

39: Add `cargo-fix` executable r=killercup a=oli-obk fixes rust-lang#32
ehuss · Oct 23, 2017 · ad3a7de · ad3a7de
2 parents 07c611b + e4a2312
commit ad3a7de
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/bin/cargo-fix.rs b/src/bin/cargo-fix.rs
@@ -0,0 +1,4 @@
+// horrible hack to get cargo to not complain about both
+// the `cargo-fix` and `rustfix` targets to point to the
+// same source file
+include!("../main.rs");
diff --git a/tests/fixtures.rs b/tests/fixtures.rs
@@ -47,9 +47,9 @@ fn fixtures() {
 
                 let manifest = format!("--manifest-path={}", &manifest[1..manifest.len() - 1]);
                 let cmd = if yolo {
-                    cmd!("cargo", "run", manifest, "--quiet", "--", "--clippy", "--yolo")
+                    cmd!("cargo", "run", manifest, "--bin", "rustfix", "--quiet", "--", "--clippy", "--yolo")
                 } else {
-                    cmd!("cargo", "run", manifest, "--quiet", "--", "--clippy")
+                    cmd!("cargo", "run", manifest, "--bin", "rustfix", "--quiet", "--", "--clippy")
                 };
                 cmd.dir(&dir)
                     .stdin(test.join("input.txt"))