Skip to content

Commit

Permalink
feat: stabilize auto fix note
Browse files Browse the repository at this point in the history
  • Loading branch information
Muscraft committed Jan 10, 2023
1 parent 0849a28 commit 6131222
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 39 deletions.
2 changes: 1 addition & 1 deletion src/cargo/core/compiler/job_queue.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1281,7 +1281,7 @@ impl<'cfg> DrainState<'cfg> {
n => drop(write!(message, " ({} duplicates)", n)),
}
// Only show the `cargo fix` message if its a local `Unit`
if unit.is_local() && config.nightly_features_allowed {
if unit.is_local() {
// Do not show this if there are any errors or no fixable warnings
if let FixableWarnings::Positive(fixable) = count.fixable {
// `cargo fix` doesnt have an option for custom builds
Expand Down
35 changes: 0 additions & 35 deletions tests/testsuite/check.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1193,38 +1193,10 @@ fn check_fixable_warning() {
.build();

foo.cargo("check")
.masquerade_as_nightly_cargo(&["auto-fix note"])
.with_stderr_contains("[..] (run `cargo fix --lib -p foo` to apply 1 suggestion)")
.run();
}

#[cargo_test]
fn check_fixable_not_nightly() {
let foo = project()
.file(
"Cargo.toml",
r#"
[package]
name = "foo"
version = "0.0.1"
"#,
)
.file("src/lib.rs", "use std::io;")
.build();

let rustc_message = raw_rustc_output(&foo, "src/lib.rs", &[]);
let expected_output = format!(
"\
[CHECKING] foo v0.0.1 ([..])
{}\
[WARNING] `foo` (lib) generated 1 warning
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
",
rustc_message
);
foo.cargo("check").with_stderr(expected_output).run();
}

#[cargo_test]
fn check_fixable_test_warning() {
let foo = project()
Expand All @@ -1250,7 +1222,6 @@ mod tests {
.build();

foo.cargo("check --all-targets")
.masquerade_as_nightly_cargo(&["auto-fix note"])
.with_stderr_contains("[..] (run `cargo fix --lib -p foo --tests` to apply 1 suggestion)")
.run();
foo.cargo("fix --lib -p foo --tests --allow-no-vcs").run();
Expand Down Expand Up @@ -1285,7 +1256,6 @@ fn check_fixable_error_no_fix() {
rustc_message
);
foo.cargo("check")
.masquerade_as_nightly_cargo(&["auto-fix note"])
.with_status(101)
.with_stderr(expected_output)
.run();
Expand Down Expand Up @@ -1325,7 +1295,6 @@ fn check_fixable_warning_workspace() {
.build();

p.cargo("check")
.masquerade_as_nightly_cargo(&["auto-fix note"])
.with_stderr_contains("[..] (run `cargo fix --lib -p foo` to apply 1 suggestion)")
.with_stderr_contains("[..] (run `cargo fix --lib -p bar` to apply 1 suggestion)")
.run();
Expand All @@ -1350,7 +1319,6 @@ fn check_fixable_example() {
.file("examples/ex1.rs", "use std::fmt; fn main() {}")
.build();
p.cargo("check --all-targets")
.masquerade_as_nightly_cargo(&["auto-fix note"])
.with_stderr_contains("[..] (run `cargo fix --example \"ex1\"` to apply 1 suggestion)")
.run();
}
Expand Down Expand Up @@ -1393,7 +1361,6 @@ fn check_fixable_bench() {
)
.build();
p.cargo("check --all-targets")
.masquerade_as_nightly_cargo(&["auto-fix note"])
.with_stderr_contains("[..] (run `cargo fix --bench \"bench\"` to apply 1 suggestion)")
.run();
}
Expand Down Expand Up @@ -1441,7 +1408,6 @@ fn check_fixable_mixed() {
)
.build();
p.cargo("check --all-targets")
.masquerade_as_nightly_cargo(&["auto-fix note"])
.with_stderr_contains("[..] (run `cargo fix --bin \"foo\" --tests` to apply 2 suggestions)")
.with_stderr_contains("[..] (run `cargo fix --example \"ex1\"` to apply 1 suggestion)")
.with_stderr_contains("[..] (run `cargo fix --bench \"bench\"` to apply 1 suggestion)")
Expand Down Expand Up @@ -1490,7 +1456,6 @@ fn check_fixable_warning_for_clippy() {
"RUSTC_WORKSPACE_WRAPPER",
clippy_driver.bin("clippy-driver"),
)
.masquerade_as_nightly_cargo(&["auto-fix note"])
.with_stderr_contains("[..] (run `cargo clippy --fix --lib -p foo` to apply 1 suggestion)")
.run();
}
1 change: 0 additions & 1 deletion tests/testsuite/install.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2045,7 +2045,6 @@ fn no_auto_fix_note() {
// This is checked by matching the full output as `with_stderr_does_not_contain`
// can be brittle
cargo_process("install auto_fix")
.masquerade_as_nightly_cargo(&["auto-fix note"])
.with_stderr(
"\
[UPDATING] `[..]` index
Expand Down
4 changes: 2 additions & 2 deletions tests/testsuite/messages.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ fn deduplicate_messages_basic() {
let rustc_message = raw_rustc_output(&p, "src/lib.rs", &[]);
let expected_output = format!(
"{}\
warning: `foo` (lib) generated 1 warning
warning: `foo` (lib) generated 1 warning (run `cargo fix --lib -p foo` to apply 1 suggestion)
warning: `foo` (lib test) generated 1 warning (1 duplicate)
[FINISHED] [..]
[EXECUTABLE] unittests src/lib.rs (target/debug/deps/foo-[..][EXE])
Expand Down Expand Up @@ -103,7 +103,7 @@ fn deduplicate_messages_mismatched_warnings() {
let expected_output = format!(
"\
{}\
warning: `foo` (lib) generated 1 warning
warning: `foo` (lib) generated 1 warning (run `cargo fix --lib -p foo` to apply 1 suggestion)
{}\
warning: `foo` (lib test) generated 2 warnings (1 duplicate)
[FINISHED] [..]
Expand Down

0 comments on commit 6131222

Please sign in to comment.