improve error messages

Author: Ariel Ben-Yehuda

compiler/rustc_metadata/messages.ftl

@@ -154,8 +154,8 @@ metadata_missing_native_library =
     could not find native static library `{$libname}`, perhaps an -L flag is missing?
 
 metadata_mitigation_less_strict_in_dependency =
-    your program uses the crate `{$extern_crate}`, that is not protected by `{$mitigation_name}{$mitigation_level}`
-    .note = recompile `{$extern_crate}` with the mitigation enabled, or use `-Z allow-partial-mitigations={$mitigation_name}` to allow creating an artifact that has the mitigation only partially enabled
+    your program uses the crate `{$extern_crate}`, that is not compiled with `{$mitigation_name}{$mitigation_level}` enabled
+    .note = recompile `{$extern_crate}` with `{$mitigation_name}{$mitigation_level}` enabled, or use `-Z allow-partial-mitigations={$mitigation_name}` to allow creating an artifact that has the mitigation only partially enabled
     .help = it is possible to disable `-Z allow-partial-mitigations={$mitigation_name}` via `-Z allow-partial-mitigations=!{$mitigation_name}`
 
 metadata_multiple_candidates =

compiler/rustc_metadata/src/errors.rs

@@ -618,6 +618,8 @@ pub struct RawDylibMalformed {
 
 #[derive(Diagnostic)]
 #[diag(metadata_mitigation_less_strict_in_dependency)]
+#[help]
+#[note]
 pub struct MitigationLessStrictInDependency {
     #[primary_span]
     pub span: Span,

tests/ui/allow-partial-mitigations/err-allow-partial-mitigations-current-edition.rs

@@ -10,8 +10,8 @@
 // disallowed by default)
 
 fn main() {}
-//~^ ERROR that is not protected by
-//~| ERROR that is not protected by
-//~| ERROR that is not protected by
-//~| ERROR that is not protected by
-//~| ERROR that is not protected by
+//~^ ERROR that is not compiled with
+//~| ERROR that is not compiled with
+//~| ERROR that is not compiled with
+//~| ERROR that is not compiled with
+//~| ERROR that is not compiled with

tests/ui/allow-partial-mitigations/err-allow-partial-mitigations-current-edition.stderr

@@ -1,32 +1,47 @@
-error: your program uses the crate `std`, that is not protected by `control-flow-guard`
+error: your program uses the crate `std`, that is not compiled with `control-flow-guard` enabled
   --> $DIR/err-allow-partial-mitigations-current-edition.rs:12:1
    |
 LL | fn main() {}
    | ^
+   |
+   = help: it is possible to disable `-Z allow-partial-mitigations=control-flow-guard` via `-Z allow-partial-mitigations=!control-flow-guard`
+   = note: recompile `std` with `control-flow-guard` enabled, or use `-Z allow-partial-mitigations=control-flow-guard` to allow creating an artifact that has the mitigation only partially enabled
 
-error: your program uses the crate `core`, that is not protected by `control-flow-guard`
+error: your program uses the crate `core`, that is not compiled with `control-flow-guard` enabled
   --> $DIR/err-allow-partial-mitigations-current-edition.rs:12:1
    |
 LL | fn main() {}
    | ^
+   |
+   = help: it is possible to disable `-Z allow-partial-mitigations=control-flow-guard` via `-Z allow-partial-mitigations=!control-flow-guard`
+   = note: recompile `core` with `control-flow-guard` enabled, or use `-Z allow-partial-mitigations=control-flow-guard` to allow creating an artifact that has the mitigation only partially enabled
 
-error: your program uses the crate `alloc`, that is not protected by `control-flow-guard`
+error: your program uses the crate `alloc`, that is not compiled with `control-flow-guard` enabled
   --> $DIR/err-allow-partial-mitigations-current-edition.rs:12:1
    |
 LL | fn main() {}
    | ^
+   |
+   = help: it is possible to disable `-Z allow-partial-mitigations=control-flow-guard` via `-Z allow-partial-mitigations=!control-flow-guard`
+   = note: recompile `alloc` with `control-flow-guard` enabled, or use `-Z allow-partial-mitigations=control-flow-guard` to allow creating an artifact that has the mitigation only partially enabled
 
-error: your program uses the crate `compiler_builtins`, that is not protected by `control-flow-guard`
+error: your program uses the crate `compiler_builtins`, that is not compiled with `control-flow-guard` enabled
   --> $DIR/err-allow-partial-mitigations-current-edition.rs:12:1
    |
 LL | fn main() {}
    | ^
+   |
+   = help: it is possible to disable `-Z allow-partial-mitigations=control-flow-guard` via `-Z allow-partial-mitigations=!control-flow-guard`
+   = note: recompile `compiler_builtins` with `control-flow-guard` enabled, or use `-Z allow-partial-mitigations=control-flow-guard` to allow creating an artifact that has the mitigation only partially enabled
 
-error: your program uses the crate `libc`, that is not protected by `control-flow-guard`
+error: your program uses the crate `libc`, that is not compiled with `control-flow-guard` enabled
   --> $DIR/err-allow-partial-mitigations-current-edition.rs:12:1
    |
 LL | fn main() {}
    | ^
+   |
+   = help: it is possible to disable `-Z allow-partial-mitigations=control-flow-guard` via `-Z allow-partial-mitigations=!control-flow-guard`
+   = note: recompile `libc` with `control-flow-guard` enabled, or use `-Z allow-partial-mitigations=control-flow-guard` to allow creating an artifact that has the mitigation only partially enabled
 
 error: aborting due to 5 previous errors
 

tests/ui/allow-partial-mitigations/err-allow-partial-mitigations.both.stderr

@@ -1,62 +1,92 @@
-error: your program uses the crate `std`, that is not protected by `stack-protector=all`
+error: your program uses the crate `std`, that is not compiled with `stack-protector=all` enabled
   --> $DIR/err-allow-partial-mitigations.rs:13:1
    |
 LL | fn main() {}
    | ^
+   |
+   = help: it is possible to disable `-Z allow-partial-mitigations=stack-protector` via `-Z allow-partial-mitigations=!stack-protector`
+   = note: recompile `std` with `stack-protector=all` enabled, or use `-Z allow-partial-mitigations=stack-protector` to allow creating an artifact that has the mitigation only partially enabled
 
-error: your program uses the crate `std`, that is not protected by `control-flow-guard`
+error: your program uses the crate `std`, that is not compiled with `control-flow-guard` enabled
   --> $DIR/err-allow-partial-mitigations.rs:13:1
    |
 LL | fn main() {}
    | ^
+   |
+   = help: it is possible to disable `-Z allow-partial-mitigations=control-flow-guard` via `-Z allow-partial-mitigations=!control-flow-guard`
+   = note: recompile `std` with `control-flow-guard` enabled, or use `-Z allow-partial-mitigations=control-flow-guard` to allow creating an artifact that has the mitigation only partially enabled
 
-error: your program uses the crate `core`, that is not protected by `stack-protector=all`
+error: your program uses the crate `core`, that is not compiled with `stack-protector=all` enabled
   --> $DIR/err-allow-partial-mitigations.rs:13:1
    |
 LL | fn main() {}
    | ^
+   |
+   = help: it is possible to disable `-Z allow-partial-mitigations=stack-protector` via `-Z allow-partial-mitigations=!stack-protector`
+   = note: recompile `core` with `stack-protector=all` enabled, or use `-Z allow-partial-mitigations=stack-protector` to allow creating an artifact that has the mitigation only partially enabled
 
-error: your program uses the crate `core`, that is not protected by `control-flow-guard`
+error: your program uses the crate `core`, that is not compiled with `control-flow-guard` enabled
   --> $DIR/err-allow-partial-mitigations.rs:13:1
    |
 LL | fn main() {}
    | ^
+   |
+   = help: it is possible to disable `-Z allow-partial-mitigations=control-flow-guard` via `-Z allow-partial-mitigations=!control-flow-guard`
+   = note: recompile `core` with `control-flow-guard` enabled, or use `-Z allow-partial-mitigations=control-flow-guard` to allow creating an artifact that has the mitigation only partially enabled
 
-error: your program uses the crate `alloc`, that is not protected by `stack-protector=all`
+error: your program uses the crate `alloc`, that is not compiled with `stack-protector=all` enabled
   --> $DIR/err-allow-partial-mitigations.rs:13:1
    |
 LL | fn main() {}
    | ^
+   |
+   = help: it is possible to disable `-Z allow-partial-mitigations=stack-protector` via `-Z allow-partial-mitigations=!stack-protector`
+   = note: recompile `alloc` with `stack-protector=all` enabled, or use `-Z allow-partial-mitigations=stack-protector` to allow creating an artifact that has the mitigation only partially enabled
 
-error: your program uses the crate `alloc`, that is not protected by `control-flow-guard`
+error: your program uses the crate `alloc`, that is not compiled with `control-flow-guard` enabled
   --> $DIR/err-allow-partial-mitigations.rs:13:1
    |
 LL | fn main() {}
    | ^
+   |
+   = help: it is possible to disable `-Z allow-partial-mitigations=control-flow-guard` via `-Z allow-partial-mitigations=!control-flow-guard`
+   = note: recompile `alloc` with `control-flow-guard` enabled, or use `-Z allow-partial-mitigations=control-flow-guard` to allow creating an artifact that has the mitigation only partially enabled
 
-error: your program uses the crate `compiler_builtins`, that is not protected by `stack-protector=all`
+error: your program uses the crate `compiler_builtins`, that is not compiled with `stack-protector=all` enabled
   --> $DIR/err-allow-partial-mitigations.rs:13:1
    |
 LL | fn main() {}
    | ^
+   |
+   = help: it is possible to disable `-Z allow-partial-mitigations=stack-protector` via `-Z allow-partial-mitigations=!stack-protector`
+   = note: recompile `compiler_builtins` with `stack-protector=all` enabled, or use `-Z allow-partial-mitigations=stack-protector` to allow creating an artifact that has the mitigation only partially enabled
 
-error: your program uses the crate `compiler_builtins`, that is not protected by `control-flow-guard`
+error: your program uses the crate `compiler_builtins`, that is not compiled with `control-flow-guard` enabled
   --> $DIR/err-allow-partial-mitigations.rs:13:1
    |
 LL | fn main() {}
    | ^
+   |
+   = help: it is possible to disable `-Z allow-partial-mitigations=control-flow-guard` via `-Z allow-partial-mitigations=!control-flow-guard`
+   = note: recompile `compiler_builtins` with `control-flow-guard` enabled, or use `-Z allow-partial-mitigations=control-flow-guard` to allow creating an artifact that has the mitigation only partially enabled
 
-error: your program uses the crate `libc`, that is not protected by `stack-protector=all`
+error: your program uses the crate `libc`, that is not compiled with `stack-protector=all` enabled
   --> $DIR/err-allow-partial-mitigations.rs:13:1
    |
 LL | fn main() {}
    | ^
+   |
+   = help: it is possible to disable `-Z allow-partial-mitigations=stack-protector` via `-Z allow-partial-mitigations=!stack-protector`
+   = note: recompile `libc` with `stack-protector=all` enabled, or use `-Z allow-partial-mitigations=stack-protector` to allow creating an artifact that has the mitigation only partially enabled
 
-error: your program uses the crate `libc`, that is not protected by `control-flow-guard`
+error: your program uses the crate `libc`, that is not compiled with `control-flow-guard` enabled
   --> $DIR/err-allow-partial-mitigations.rs:13:1
    |
 LL | fn main() {}
    | ^
+   |
+   = help: it is possible to disable `-Z allow-partial-mitigations=control-flow-guard` via `-Z allow-partial-mitigations=!control-flow-guard`
+   = note: recompile `libc` with `control-flow-guard` enabled, or use `-Z allow-partial-mitigations=control-flow-guard` to allow creating an artifact that has the mitigation only partially enabled
 
 error: aborting due to 10 previous errors
 

tests/ui/allow-partial-mitigations/err-allow-partial-mitigations.disable.stderr

@@ -1,32 +1,47 @@
-error: your program uses the crate `std`, that is not protected by `stack-protector=all`
+error: your program uses the crate `std`, that is not compiled with `stack-protector=all` enabled
   --> $DIR/err-allow-partial-mitigations.rs:13:1
    |
 LL | fn main() {}
    | ^
+   |
+   = help: it is possible to disable `-Z allow-partial-mitigations=stack-protector` via `-Z allow-partial-mitigations=!stack-protector`
+   = note: recompile `std` with `stack-protector=all` enabled, or use `-Z allow-partial-mitigations=stack-protector` to allow creating an artifact that has the mitigation only partially enabled
 
-error: your program uses the crate `core`, that is not protected by `stack-protector=all`
+error: your program uses the crate `core`, that is not compiled with `stack-protector=all` enabled
   --> $DIR/err-allow-partial-mitigations.rs:13:1
    |
 LL | fn main() {}
    | ^
+   |
+   = help: it is possible to disable `-Z allow-partial-mitigations=stack-protector` via `-Z allow-partial-mitigations=!stack-protector`
+   = note: recompile `core` with `stack-protector=all` enabled, or use `-Z allow-partial-mitigations=stack-protector` to allow creating an artifact that has the mitigation only partially enabled
 
-error: your program uses the crate `alloc`, that is not protected by `stack-protector=all`
+error: your program uses the crate `alloc`, that is not compiled with `stack-protector=all` enabled
   --> $DIR/err-allow-partial-mitigations.rs:13:1
    |
 LL | fn main() {}
    | ^
+   |
+   = help: it is possible to disable `-Z allow-partial-mitigations=stack-protector` via `-Z allow-partial-mitigations=!stack-protector`
+   = note: recompile `alloc` with `stack-protector=all` enabled, or use `-Z allow-partial-mitigations=stack-protector` to allow creating an artifact that has the mitigation only partially enabled
 
-error: your program uses the crate `compiler_builtins`, that is not protected by `stack-protector=all`
+error: your program uses the crate `compiler_builtins`, that is not compiled with `stack-protector=all` enabled
   --> $DIR/err-allow-partial-mitigations.rs:13:1
    |
 LL | fn main() {}
    | ^
+   |
+   = help: it is possible to disable `-Z allow-partial-mitigations=stack-protector` via `-Z allow-partial-mitigations=!stack-protector`
+   = note: recompile `compiler_builtins` with `stack-protector=all` enabled, or use `-Z allow-partial-mitigations=stack-protector` to allow creating an artifact that has the mitigation only partially enabled
 
-error: your program uses the crate `libc`, that is not protected by `stack-protector=all`
+error: your program uses the crate `libc`, that is not compiled with `stack-protector=all` enabled
   --> $DIR/err-allow-partial-mitigations.rs:13:1
    |
 LL | fn main() {}
    | ^
+   |
+   = help: it is possible to disable `-Z allow-partial-mitigations=stack-protector` via `-Z allow-partial-mitigations=!stack-protector`
+   = note: recompile `libc` with `stack-protector=all` enabled, or use `-Z allow-partial-mitigations=stack-protector` to allow creating an artifact that has the mitigation only partially enabled
 
 error: aborting due to 5 previous errors
 

tests/ui/allow-partial-mitigations/err-allow-partial-mitigations.enable-disable.stderr

@@ -1,32 +1,47 @@
-error: your program uses the crate `std`, that is not protected by `stack-protector=all`
+error: your program uses the crate `std`, that is not compiled with `stack-protector=all` enabled
   --> $DIR/err-allow-partial-mitigations.rs:13:1
    |
 LL | fn main() {}
    | ^
+   |
+   = help: it is possible to disable `-Z allow-partial-mitigations=stack-protector` via `-Z allow-partial-mitigations=!stack-protector`
+   = note: recompile `std` with `stack-protector=all` enabled, or use `-Z allow-partial-mitigations=stack-protector` to allow creating an artifact that has the mitigation only partially enabled
 
-error: your program uses the crate `core`, that is not protected by `stack-protector=all`
+error: your program uses the crate `core`, that is not compiled with `stack-protector=all` enabled
   --> $DIR/err-allow-partial-mitigations.rs:13:1
    |
 LL | fn main() {}
    | ^
+   |
+   = help: it is possible to disable `-Z allow-partial-mitigations=stack-protector` via `-Z allow-partial-mitigations=!stack-protector`
+   = note: recompile `core` with `stack-protector=all` enabled, or use `-Z allow-partial-mitigations=stack-protector` to allow creating an artifact that has the mitigation only partially enabled
 
-error: your program uses the crate `alloc`, that is not protected by `stack-protector=all`
+error: your program uses the crate `alloc`, that is not compiled with `stack-protector=all` enabled
   --> $DIR/err-allow-partial-mitigations.rs:13:1
    |
 LL | fn main() {}
    | ^
+   |
+   = help: it is possible to disable `-Z allow-partial-mitigations=stack-protector` via `-Z allow-partial-mitigations=!stack-protector`
+   = note: recompile `alloc` with `stack-protector=all` enabled, or use `-Z allow-partial-mitigations=stack-protector` to allow creating an artifact that has the mitigation only partially enabled
 
-error: your program uses the crate `compiler_builtins`, that is not protected by `stack-protector=all`
+error: your program uses the crate `compiler_builtins`, that is not compiled with `stack-protector=all` enabled
   --> $DIR/err-allow-partial-mitigations.rs:13:1
    |
 LL | fn main() {}
    | ^
+   |
+   = help: it is possible to disable `-Z allow-partial-mitigations=stack-protector` via `-Z allow-partial-mitigations=!stack-protector`
+   = note: recompile `compiler_builtins` with `stack-protector=all` enabled, or use `-Z allow-partial-mitigations=stack-protector` to allow creating an artifact that has the mitigation only partially enabled
 
-error: your program uses the crate `libc`, that is not protected by `stack-protector=all`
+error: your program uses the crate `libc`, that is not compiled with `stack-protector=all` enabled
   --> $DIR/err-allow-partial-mitigations.rs:13:1
    |
 LL | fn main() {}
    | ^
+   |
+   = help: it is possible to disable `-Z allow-partial-mitigations=stack-protector` via `-Z allow-partial-mitigations=!stack-protector`
+   = note: recompile `libc` with `stack-protector=all` enabled, or use `-Z allow-partial-mitigations=stack-protector` to allow creating an artifact that has the mitigation only partially enabled
 
 error: aborting due to 5 previous errors