about summary refs log tree commit diff
path: root/src/librustc_error_codes
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-03-02 03:16:22 +0000
committerbors <bors@rust-lang.org>2020-03-02 03:16:22 +0000
commite86c9e6ef8be7ddec0360f20aae7d86c69c59a83 (patch)
tree82d8856872d01ee573207ec3ac37de93eb5fd6e5 /src/librustc_error_codes
parent9dc8dad14fc31f49254d299457e34d00721c4a73 (diff)
parent5f3ffee6b77f073b78bdc76e7a0f4811bc39e7f9 (diff)
downloadrust-e86c9e6ef8be7ddec0360f20aae7d86c69c59a83.tar.gz
rust-e86c9e6ef8be7ddec0360f20aae7d86c69c59a83.zip
Auto merge of #69442 - jakevossen5:master, r=Mark-Simulacrum
`--explain` disambiguates no long description and invalid error codes

Closes #44710

First code contribution here, so feedback is very much appreciated!

cc @zackmdavis
cc @Mark-Simulacrum
Diffstat (limited to 'src/librustc_error_codes')
-rw-r--r--src/librustc_error_codes/lib.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/librustc_error_codes/lib.rs b/src/librustc_error_codes/lib.rs
index f051fdd11b8..4353a294cc3 100644
--- a/src/librustc_error_codes/lib.rs
+++ b/src/librustc_error_codes/lib.rs
@@ -3,8 +3,9 @@
 
 macro_rules! register_diagnostics {
     ($($ecode:ident: $message:expr,)* ; $($code:ident,)*) => (
-        pub static DIAGNOSTICS: &[(&str, &str)] = &[
-            $( (stringify!($ecode), $message), )*
+        pub static DIAGNOSTICS: &[(&str, Option<&str>)] = &[
+            $( (stringify!($ecode), Some($message)), )*
+            $( (stringify!($code), None), )*
         ];
     )
 }