Skip to content

Commit d1c5bf8

Browse files
committed
fix: default to all targets when using --edition flags in cargo fix
Signed-off-by: Rustin170506 <[email protected]>
1 parent 94b1f0f commit d1c5bf8

File tree

2 files changed

+36
-16
lines changed

2 files changed

+36
-16
lines changed

src/bin/cargo/commands/fix.rs

+5-2
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,11 @@ pub fn exec(gctx: &mut GlobalContext, args: &ArgMatches) -> CliResult {
8181

8282
let mut opts = args.compile_options(gctx, mode, Some(&ws), ProfileChecking::LegacyTestOnly)?;
8383

84-
if !opts.filter.is_specific() {
85-
// cargo fix with no target selection implies `--all-targets`.
84+
let edition = args.flag("edition") || args.flag("edition-idioms");
85+
if !opts.filter.is_specific() && edition {
86+
// When `cargo fix` is run without specifying targets but with `--edition` or `--edition-idioms`,
87+
// it should default to fixing all targets.
88+
// See: https://github.com/rust-lang/cargo/issues/13527
8689
opts.filter = ops::CompileFilter::new_all_targets();
8790
}
8891

tests/testsuite/fix.rs

+31-14
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ fn prepare_for_2018() {
198198
}
199199

200200
#[cargo_test]
201-
fn fix_tests() {
201+
fn do_not_fix_tests() {
202202
let p = project()
203203
.file(
204204
"src/lib.rs",
@@ -220,6 +220,36 @@ fn fix_tests() {
220220
p.cargo("fix --allow-no-vcs")
221221
.with_stderr_data(str![[r#"
222222
[CHECKING] foo v0.0.1 ([ROOT]/foo)
223+
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
224+
225+
"#]])
226+
.with_stdout_data("")
227+
.run();
228+
}
229+
230+
#[cargo_test]
231+
fn fix_tests_with_edition() {
232+
let p = project()
233+
.file(
234+
"src/lib.rs",
235+
r#"
236+
pub fn foo() {}
237+
238+
#[cfg(test)]
239+
mod tests {
240+
#[test]
241+
fn it_works() {
242+
let mut x = 3;
243+
x;
244+
}
245+
}
246+
"#,
247+
)
248+
.build();
249+
250+
p.cargo("fix --edition-idioms --allow-no-vcs")
251+
.with_stderr_data(str![[r#"
252+
[CHECKING] foo v0.0.1 ([ROOT]/foo)
223253
[FIXED] src/lib.rs (1 fix)
224254
[WARNING] path statement with no effect
225255
--> src/lib.rs:9:25
@@ -747,19 +777,6 @@ fn does_not_warn_about_dirty_ignored_files() {
747777
p.cargo("fix").run();
748778
}
749779

750-
#[cargo_test]
751-
fn fix_all_targets_by_default() {
752-
let p = project()
753-
.file("src/lib.rs", "pub fn foo() { let mut x = 3; let _ = x; }")
754-
.file("tests/foo.rs", "pub fn foo() { let mut x = 3; let _ = x; }")
755-
.build();
756-
p.cargo("fix --allow-no-vcs")
757-
.env("__CARGO_FIX_YOLO", "1")
758-
.run();
759-
assert!(!p.read_file("src/lib.rs").contains("let mut x"));
760-
assert!(!p.read_file("tests/foo.rs").contains("let mut x"));
761-
}
762-
763780
#[cargo_test]
764781
fn prepare_for_unstable() {
765782
// During the period where a new edition is coming up, but not yet stable,

0 commit comments

Comments
 (0)