Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cargo fix --prepare-for should only apply edition fixes #5948

Closed
wants to merge 2 commits into from
Closed

Cargo fix --prepare-for should only apply edition fixes #5948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8344e9b
Cargo fix --prepare-for should only apply edition fixes
dwijnand Aug 29, 2018
5cc1d9b
Define the only warnings to fix from prepare_for_edition
dwijnand Aug 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/cargo/ops/fix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,12 @@ fn rustfix_and_fix(fixes: &mut FixedCrate, rustc: &Path, filename: &Path, args:
// If not empty, filter by these lints
//
// TODO: Implement a way to specify this
let only = HashSet::new();
let mut only = HashSet::new();
match &args.prepare_for_edition {
PrepareFor::Edition(edition) => { only.insert(format!("rust_{}_compatibility", edition)); },
PrepareFor::Next => { only.insert(format!("rust_{}_compatibility", args.next_edition())); },
PrepareFor::None => (),
}

let mut cmd = Command::new(rustc);
cmd.arg("--error-format=json");
Expand Down
14 changes: 14 additions & 0 deletions tests/testsuite/fix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -880,6 +880,20 @@ fn fix_overlapping() {
assert!(contents.contains("crate::foo::<crate::A>()"));
}

#[test]
fn prepare_for_leaves_unrelated_warnings_alone() {
if !is_nightly() { return; }

let p = project().file("src/main.rs", "fn main() { let x = 1; }").build();

p.cargo("fix --allow-no-vcs --prepare-for 2018").run();

let contents = p.read_file("src/main.rs");
println!("{}", contents);
assert!(contents.contains("let x = 1;"));
assert!(!contents.contains("let _x = 1;"));
}

#[test]
fn fix_idioms() {
if !is_nightly() {
Expand Down