Use rustc_demangle::demangle_stream instead of our own demangle helpe…

…r based on rust-demangler
taiki-e · Mar 10, 2024 · 60affb1 · 60affb1
1 parent 541f698
commit 60affb1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 129 deletions.
diff --git a/.cspell.json b/.cspell.json
@@ -47,10 +47,5 @@
       "dictionaries": ["rust"]
     }
   ],
-  "ignorePaths": [
-    "**/fixtures/*.json",
-    "tests/fixtures/coverage-reports/**",
-    // mangled names in test data case a lot of FP.
-    "**/src/demangle.rs"
-  ]
+  "ignorePaths": ["**/fixtures/*.json", "tests/fixtures/coverage-reports/**"]
 }
diff --git a/Cargo.toml b/Cargo.toml
@@ -32,7 +32,7 @@ lcov2cobertura = "1.0.1"
 lexopt = "0.3"
 opener = "0.6"
 regex = { version = "1.3", default-features = false, features = ["perf", "std"] }
-rustc-demangle = "0.1.21"
+rustc-demangle = { version = "0.1.23", features = ["std"] }
 ruzstd = { version = "0.6", default-features = false, features = ["std"] }
 serde = "1.0.103"
 serde_derive = "1.0.103"

diff --git a/src/demangle.rs b/src/demangle.rs
diff --git a/src/main.rs b/src/main.rs
@@ -44,7 +44,6 @@ mod cargo;
 mod clean;
 mod cli;
 mod context;
-mod demangle;
 mod env;
 mod fs;
 mod metadata;
@@ -68,7 +67,9 @@ fn try_main() -> Result<()> {
     term::verbose::set(args.verbose != 0);
 
     match args.subcommand {
-        Subcommand::Demangle => demangle::run()?,
+        Subcommand::Demangle => {
+            rustc_demangle::demangle_stream(&mut io::stdin().lock(), &mut io::stdout(), false)?;
+        }
         Subcommand::Clean => clean::run(&mut args)?,
         Subcommand::ShowEnv => {
             let cx = &Context::new(args)?;