Replace Registry type with a lazily initialized static

And move try_find_description to rustc_errors::codes.

Author: bjorn3

src/parse/session.rs

@@ -5,7 +5,6 @@ use std::sync::atomic::{AtomicBool, Ordering};
 use rustc_data_structures::sync::IntoDynSyncSend;
 use rustc_errors::annotate_snippet_emitter_writer::AnnotateSnippetEmitter;
 use rustc_errors::emitter::{DynEmitter, Emitter, SilentEmitter, stderr_destination};
-use rustc_errors::registry::Registry;
 use rustc_errors::translation::Translator;
 use rustc_errors::{ColorConfig, Diag, DiagCtxt, DiagInner, Level as DiagnosticLevel};
 use rustc_session::parse::ParseSess as RawParseSess;
@@ -41,10 +40,10 @@ struct SilentOnIgnoredFilesEmitter {
 }
 
 impl SilentOnIgnoredFilesEmitter {
-    fn handle_non_ignoreable_error(&mut self, diag: DiagInner, registry: &Registry) {
+    fn handle_non_ignoreable_error(&mut self, diag: DiagInner) {
         self.has_non_ignorable_parser_errors = true;
         self.can_reset.store(false, Ordering::Release);
-        self.emitter.emit_diagnostic(diag, registry);
+        self.emitter.emit_diagnostic(diag);
     }
 }
 
@@ -53,9 +52,9 @@ impl Emitter for SilentOnIgnoredFilesEmitter {
         None
     }
 
-    fn emit_diagnostic(&mut self, diag: DiagInner, registry: &Registry) {
+    fn emit_diagnostic(&mut self, diag: DiagInner) {
         if diag.level() == DiagnosticLevel::Fatal {
-            return self.handle_non_ignoreable_error(diag, registry);
+            return self.handle_non_ignoreable_error(diag);
         }
         if let Some(primary_span) = &diag.span.primary_span() {
             let file_name = self.source_map.span_to_filename(*primary_span);
@@ -73,7 +72,7 @@ impl Emitter for SilentOnIgnoredFilesEmitter {
                 }
             }
         }
-        self.handle_non_ignoreable_error(diag, registry);
+        self.handle_non_ignoreable_error(diag);
     }
 
     fn translator(&self) -> &Translator {
@@ -340,7 +339,7 @@ mod tests {
                 None
             }
 
-            fn emit_diagnostic(&mut self, _diag: DiagInner, _registry: &Registry) {
+            fn emit_diagnostic(&mut self, _diag: DiagInner) {
                 self.num_emitted_errors.fetch_add(1, Ordering::Release);
             }
 
@@ -401,7 +400,6 @@ mod tests {
             let source =
                 String::from(r#"extern "system" fn jni_symbol!( funcName ) ( ... ) -> {} "#);
             source_map.new_source_file(filename(&source_map, "foo.rs"), source);
-            let registry = Registry::new();
             let mut emitter = build_emitter(
                 Arc::clone(&num_emitted_errors),
                 Arc::clone(&can_reset_errors),
@@ -410,7 +408,7 @@ mod tests {
             );
             let span = MultiSpan::from_span(mk_sp(BytePos(0), BytePos(1)));
             let fatal_diagnostic = build_diagnostic(DiagnosticLevel::Fatal, Some(span));
-            emitter.emit_diagnostic(fatal_diagnostic, &registry);
+            emitter.emit_diagnostic(fatal_diagnostic);
             assert_eq!(num_emitted_errors.load(Ordering::Acquire), 1);
             assert_eq!(can_reset_errors.load(Ordering::Acquire), false);
         }
@@ -424,7 +422,6 @@ mod tests {
             let source_map = Arc::new(SourceMap::new(FilePathMapping::empty()));
             let source = String::from(r#"pub fn bar() { 1x; }"#);
             source_map.new_source_file(filename(&source_map, "foo.rs"), source);
-            let registry = Registry::new();
             let mut emitter = build_emitter(
                 Arc::clone(&num_emitted_errors),
                 Arc::clone(&can_reset_errors),
@@ -433,7 +430,7 @@ mod tests {
             );
             let span = MultiSpan::from_span(mk_sp(BytePos(0), BytePos(1)));
             let non_fatal_diagnostic = build_diagnostic(DiagnosticLevel::Warning, Some(span));
-            emitter.emit_diagnostic(non_fatal_diagnostic, &registry);
+            emitter.emit_diagnostic(non_fatal_diagnostic);
             assert_eq!(num_emitted_errors.load(Ordering::Acquire), 0);
             assert_eq!(can_reset_errors.load(Ordering::Acquire), true);
         }
@@ -446,7 +443,6 @@ mod tests {
             let source_map = Arc::new(SourceMap::new(FilePathMapping::empty()));
             let source = String::from(r#"pub fn bar() { 1x; }"#);
             source_map.new_source_file(filename(&source_map, "foo.rs"), source);
-            let registry = Registry::new();
             let mut emitter = build_emitter(
                 Arc::clone(&num_emitted_errors),
                 Arc::clone(&can_reset_errors),
@@ -455,7 +451,7 @@ mod tests {
             );
             let span = MultiSpan::from_span(mk_sp(BytePos(0), BytePos(1)));
             let non_fatal_diagnostic = build_diagnostic(DiagnosticLevel::Warning, Some(span));
-            emitter.emit_diagnostic(non_fatal_diagnostic, &registry);
+            emitter.emit_diagnostic(non_fatal_diagnostic);
             assert_eq!(num_emitted_errors.load(Ordering::Acquire), 1);
             assert_eq!(can_reset_errors.load(Ordering::Acquire), false);
         }
@@ -474,7 +470,6 @@ mod tests {
             source_map.new_source_file(filename(&source_map, "bar.rs"), bar_source);
             source_map.new_source_file(filename(&source_map, "foo.rs"), foo_source);
             source_map.new_source_file(filename(&source_map, "fatal.rs"), fatal_source);
-            let registry = Registry::new();
             let mut emitter = build_emitter(
                 Arc::clone(&num_emitted_errors),
                 Arc::clone(&can_reset_errors),
@@ -486,9 +481,9 @@ mod tests {
             let bar_diagnostic = build_diagnostic(DiagnosticLevel::Warning, Some(bar_span));
             let foo_diagnostic = build_diagnostic(DiagnosticLevel::Warning, Some(foo_span));
             let fatal_diagnostic = build_diagnostic(DiagnosticLevel::Fatal, None);
-            emitter.emit_diagnostic(bar_diagnostic, &registry);
-            emitter.emit_diagnostic(foo_diagnostic, &registry);
-            emitter.emit_diagnostic(fatal_diagnostic, &registry);
+            emitter.emit_diagnostic(bar_diagnostic);
+            emitter.emit_diagnostic(foo_diagnostic);
+            emitter.emit_diagnostic(fatal_diagnostic);
             assert_eq!(num_emitted_errors.load(Ordering::Acquire), 2);
             assert_eq!(can_reset_errors.load(Ordering::Acquire), false);
         }