Convert RUST_FLAGS and RUSTDOC_FLAGS warnings

Author: jneem

src/cargo/ops/cargo_compile/mod.rs

@@ -58,6 +58,7 @@ use crate::util::interning::InternedString;
 use crate::util::{CargoResult, StableHasher};
 
 mod compile_filter;
+use annotate_snippets::Level;
 pub use compile_filter::{CompileFilter, FilterRule, LibRule};
 
 pub(super) mod unit_generator;
@@ -230,17 +231,24 @@ pub fn create_bcx<'a, 'gctx>(
     match build_config.intent {
         UserIntent::Test | UserIntent::Build | UserIntent::Check { .. } | UserIntent::Bench => {
             if ws.gctx().get_env("RUST_FLAGS").is_ok() {
-                gctx.shell()
-                    .warn("ignoring environment variable `RUST_FLAGS`")?;
-                gctx.shell().note("rust flags are passed via `RUSTFLAGS`")?;
+                gctx.shell().print_report(
+                    &[Level::WARNING
+                        .secondary_title("ignoring environment variable `RUST_FLAGS`")
+                        .element(Level::HELP.message("rust flags are passed via `RUSTFLAGS`"))],
+                    false,
+                )?;
             }
         }
         UserIntent::Doc { .. } | UserIntent::Doctest => {
             if ws.gctx().get_env("RUSTDOC_FLAGS").is_ok() {
-                gctx.shell()
-                    .warn("ignoring environment variable `RUSTDOC_FLAGS`")?;
-                gctx.shell()
-                    .note("rustdoc flags are passed via `RUSTDOCFLAGS`")?;
+                gctx.shell().print_report(
+                    &[Level::WARNING
+                        .secondary_title("ignoring environment variable `RUSTDOC_FLAGS`")
+                        .element(
+                            Level::HELP.message("rustdoc flags are passed via `RUSTDOCFLAGS`"),
+                        )],
+                    false,
+                )?;
             }
         }
     }

tests/testsuite/rustdocflags.rs

@@ -116,7 +116,8 @@ fn rustdocflags_misspelled() {
         .env("RUSTDOC_FLAGS", "foo")
         .with_stderr_data(str![[r#"
 [WARNING] ignoring environment variable `RUSTDOC_FLAGS`
-[NOTE] rustdoc flags are passed via `RUSTDOCFLAGS`
+  |
+  = [HELP] rustdoc flags are passed via `RUSTDOCFLAGS`
 ...
 "#]])
         .run();

tests/testsuite/rustflags.rs

@@ -1441,13 +1441,12 @@ fn env_rustflags_misspelled() {
     for cmd in &["check", "build", "run", "test", "bench"] {
         p.cargo(cmd)
             .env("RUST_FLAGS", "foo")
-            .with_stderr_data(
-                "\
+            .with_stderr_data(str![[r#"
 [WARNING] ignoring environment variable `RUST_FLAGS`
-[NOTE] rust flags are passed via `RUSTFLAGS`
+  |
+  = [HELP] rust flags are passed via `RUSTFLAGS`
 ...
-",
-            )
+"#]])
             .run();
     }
 }
@@ -1473,7 +1472,8 @@ fn env_rustflags_misspelled_build_script() {
         .env("RUST_FLAGS", "foo")
         .with_stderr_data(str![[r#"
 [WARNING] ignoring environment variable `RUST_FLAGS`
-[NOTE] rust flags are passed via `RUSTFLAGS`
+  |
+  = [HELP] rust flags are passed via `RUSTFLAGS`
 [COMPILING] foo v0.0.1 ([ROOT]/foo)
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s