Rollup merge of rust-lang#60046 - euclio:missing-error-code-descriptions, r=estebank

hide `--explain` hint if error has no extended info

Fixes rust-lang#59848.

r? @estebank

Author: Centril

src/librustc_errors/lib.rs

@@ -16,6 +16,7 @@ pub use emitter::ColorConfig;
 use Level::*;
 
 use emitter::{Emitter, EmitterWriter};
+use registry::Registry;
 
 use rustc_data_structures::sync::{self, Lrc, Lock, AtomicUsize, AtomicBool, SeqCst};
 use rustc_data_structures::fx::FxHashSet;
@@ -651,7 +652,7 @@ impl Handler {
         self.err_count() > 0
     }
 
-    pub fn print_error_count(&self) {
+    pub fn print_error_count(&self, registry: &Registry) {
         let s = match self.err_count() {
             0 => return,
             1 => "aborting due to previous error".to_string(),
@@ -666,19 +667,22 @@ impl Handler {
         let can_show_explain = self.emitter.borrow().should_show_explain();
         let are_there_diagnostics = !self.emitted_diagnostic_codes.borrow().is_empty();
         if can_show_explain && are_there_diagnostics {
-            let mut error_codes =
-                self.emitted_diagnostic_codes.borrow()
-                                             .iter()
-                                             .filter_map(|x| match *x {
-                                                 DiagnosticId::Error(ref s) => Some(s.clone()),
-                                                 _ => None,
-                                             })
-                                             .collect::<Vec<_>>();
+            let mut error_codes = self
+                .emitted_diagnostic_codes
+                .borrow()
+                .iter()
+                .filter_map(|x| match &x {
+                    DiagnosticId::Error(s) if registry.find_description(s).is_some() => {
+                        Some(s.clone())
+                    }
+                    _ => None,
+                })
+                .collect::<Vec<_>>();
             if !error_codes.is_empty() {
                 error_codes.sort();
                 if error_codes.len() > 1 {
                     let limit = if error_codes.len() > 9 { 9 } else { error_codes.len() };
-                    self.failure(&format!("Some errors occurred: {}{}",
+                    self.failure(&format!("Some errors have detailed explanations: {}{}",
                                           error_codes[..limit].join(", "),
                                           if error_codes.len() > 9 { "..." } else { "." }));
                     self.failure(&format!("For more information about an error, try \

src/librustc_interface/interface.rs

@@ -111,7 +111,9 @@ where
         crate_name: config.crate_name,
     };
 
-    let _sess_abort_error = OnDrop(|| compiler.sess.diagnostic().print_error_count());
+    let _sess_abort_error = OnDrop(|| {
+        compiler.sess.diagnostic().print_error_count(&util::diagnostics_registry());
+    });
 
     if compiler.sess.profile_queries() {
         profile::begin(&compiler.sess);

src/test/ui-fulldeps/hash-stable-is-unstable.stderr

@@ -49,5 +49,5 @@ LL | #[derive(HashStable)]
 
 error: aborting due to 6 previous errors
 
-Some errors occurred: E0601, E0658.
+Some errors have detailed explanations: E0601, E0658.
 For more information about an error, try `rustc --explain E0601`.

src/test/ui-fulldeps/macro-crate-rlib.stderr

@@ -6,4 +6,3 @@ LL | #![plugin(rlib_crate_test)]
 
 error: aborting due to previous error
 
-For more information about this error, try `rustc --explain E0457`.

src/test/ui/E0594.ast.nll.stderr

@@ -6,4 +6,3 @@ LL |     NUM = 20;
 
 error: aborting due to previous error
 
-For more information about this error, try `rustc --explain E0594`.

src/test/ui/E0594.ast.stderr

@@ -6,4 +6,3 @@ LL |     NUM = 20;
 
 error: aborting due to previous error
 
-For more information about this error, try `rustc --explain E0594`.

src/test/ui/E0594.mir.stderr

@@ -6,4 +6,3 @@ LL |     NUM = 20;
 
 error: aborting due to previous error
 
-For more information about this error, try `rustc --explain E0594`.

src/test/ui/E0660.stderr

@@ -12,4 +12,3 @@ LL |     asm!("nop" "nop" : "=r"(a));
 
 error: aborting due to 2 previous errors
 
-For more information about this error, try `rustc --explain E0660`.

src/test/ui/E0661.stderr

@@ -6,4 +6,3 @@ LL |     asm!("nop" : "r"(a));
 
 error: aborting due to previous error
 
-For more information about this error, try `rustc --explain E0661`.

src/test/ui/E0662.stderr

@@ -6,4 +6,3 @@ LL |          : "=test"("a")
 
 error: aborting due to previous error
 
-For more information about this error, try `rustc --explain E0662`.