Simplify impl of dump_symbol_names_and_def_paths

Author: fmease

Cargo.lock

@@ -4692,7 +4692,6 @@ dependencies = [
  "rustc-demangle",
  "rustc_abi",
  "rustc_data_structures",
- "rustc_errors",
  "rustc_hashes",
  "rustc_hir",
  "rustc_middle",

compiler/rustc_symbol_mangling/Cargo.toml

@@ -9,7 +9,6 @@ punycode = "0.4.0"
 rustc-demangle = "0.1.27"
 rustc_abi = { path = "../rustc_abi" }
 rustc_data_structures = { path = "../rustc_data_structures" }
-rustc_errors = { path = "../rustc_errors" }
 rustc_hashes = { path = "../rustc_hashes" }
 rustc_hir = { path = "../rustc_hir" }
 rustc_middle = { path = "../rustc_middle" }

compiler/rustc_symbol_mangling/src/errors.rs

@@ -101,7 +101,6 @@ mod hashed;
 mod legacy;
 mod v0;
 
-pub mod errors;
 pub mod test;
 
 pub use v0::mangle_internal_symbol;

compiler/rustc_symbol_mangling/src/lib.rs

@@ -4,13 +4,10 @@
 //! def-path. This is used for unit testing the code that generates
 //! paths etc in all kinds of annoying scenarios.
 
-use rustc_hir::def_id::LocalDefId;
-use rustc_hir::find_attr;
+use rustc_hir::{CRATE_OWNER_ID, find_attr};
 use rustc_middle::ty::print::with_no_trimmed_paths;
 use rustc_middle::ty::{GenericArgs, Instance, TyCtxt};
 
-use crate::errors::{Kind, TestOutput};
-
 pub fn dump_symbol_names_and_def_paths(tcx: TyCtxt<'_>) {
     // if the `rustc_attrs` feature is not enabled, then the
     // attributes we are interested in cannot be present anyway, so
@@ -20,73 +17,33 @@ pub fn dump_symbol_names_and_def_paths(tcx: TyCtxt<'_>) {
     }
 
     tcx.dep_graph.with_ignore(|| {
-        let mut symbol_names = SymbolNamesTest { tcx };
-        let crate_items = tcx.hir_crate_items(());
-
-        for id in crate_items.free_items() {
-            symbol_names.process_attrs(id.owner_id.def_id);
-        }
-
-        for id in crate_items.trait_items() {
-            symbol_names.process_attrs(id.owner_id.def_id);
-        }
-
-        for id in crate_items.impl_items() {
-            symbol_names.process_attrs(id.owner_id.def_id);
-        }
+        for id in tcx.hir_crate_items(()).owners() {
+            if id == CRATE_OWNER_ID {
+                continue;
+            }
 
-        for id in crate_items.foreign_items() {
-            symbol_names.process_attrs(id.owner_id.def_id);
-        }
-    })
-}
+            // The format `$tag($value)` is chosen so that tests can elect to test the
+            // entirety of the string, if they choose, or else just some subset.
 
-struct SymbolNamesTest<'tcx> {
-    tcx: TyCtxt<'tcx>,
-}
+            if let Some(&span) = find_attr!(tcx, id.def_id, RustcDumpSymbolName(span) => span) {
+                let def_id = id.def_id.to_def_id();
+                let args = GenericArgs::identity_for_item(tcx, id.def_id);
+                let args = tcx.erase_and_anonymize_regions(args);
+                let instance = Instance::new_raw(def_id, args);
+                let mangled = tcx.symbol_name(instance);
 
-impl SymbolNamesTest<'_> {
-    fn process_attrs(&mut self, def_id: LocalDefId) {
-        let tcx = self.tcx;
-        // The formatting of `tag({})` is chosen so that tests can elect
-        // to test the entirety of the string, if they choose, or else just
-        // some subset.
+                tcx.dcx().span_err(span, format!("symbol-name({mangled})"));
 
-        if let Some(attr_span) = find_attr!(tcx, def_id, RustcDumpSymbolName(span) => span) {
-            let def_id = def_id.to_def_id();
-            let instance = Instance::new_raw(
-                def_id,
-                tcx.erase_and_anonymize_regions(GenericArgs::identity_for_item(tcx, def_id)),
-            );
-            let mangled = tcx.symbol_name(instance);
-            tcx.dcx().emit_err(TestOutput {
-                span: *attr_span,
-                kind: Kind::SymbolName,
-                content: format!("{mangled}"),
-            });
-            if let Ok(demangling) = rustc_demangle::try_demangle(mangled.name) {
-                tcx.dcx().emit_err(TestOutput {
-                    span: *attr_span,
-                    kind: Kind::Demangling,
-                    content: format!("{demangling}"),
-                });
-                tcx.dcx().emit_err(TestOutput {
-                    span: *attr_span,
-                    kind: Kind::DemanglingAlt,
-                    content: format!("{demangling:#}"),
-                });
+                if let Ok(demangling) = rustc_demangle::try_demangle(mangled.name) {
+                    tcx.dcx().span_err(span, format!("demangling({demangling})"));
+                    tcx.dcx().span_err(span, format!("demangling-alt({demangling:#})"));
+                }
             }
-        }
 
-        if let Some(attr_span) = find_attr!(
-            tcx, def_id,
-            RustcDumpDefPath(span) => span
-        ) {
-            tcx.dcx().emit_err(TestOutput {
-                span: *attr_span,
-                kind: Kind::DefPath,
-                content: with_no_trimmed_paths!(tcx.def_path_str(def_id)),
-            });
+            if let Some(&span) = find_attr!(tcx, id.def_id, RustcDumpDefPath(span) => span) {
+                let def_path = with_no_trimmed_paths!(tcx.def_path_str(id.def_id));
+                tcx.dcx().span_err(span, format!("def-path({def_path})"));
+            }
         }
-    }
+    })
 }