Revert to 1fa54ad

Author: rust-timer

Cargo.lock

@@ -2821,13 +2821,6 @@ dependencies = [
  "rls-span",
 ]
 
-[[package]]
-name = "rust-demangler"
-version = "0.0.0"
-dependencies = [
- "rustc-demangle",
-]
-
 [[package]]
 name = "rustbook"
 version = "0.1.0"

Cargo.toml

@@ -17,7 +17,6 @@ members = [
   "src/tools/remote-test-client",
   "src/tools/remote-test-server",
   "src/tools/rust-installer",
-  "src/tools/rust-demangler",
   "src/tools/cargo",
   "src/tools/rustdoc",
   "src/tools/rls",

src/backtrace

@@ -370,7 +370,6 @@ impl<'a> Builder<'a> {
                 tool::Cargo,
                 tool::Rls,
                 tool::RustAnalyzer,
-                tool::RustDemangler,
                 tool::Rustdoc,
                 tool::Clippy,
                 tool::CargoClippy,
@@ -1444,10 +1443,6 @@ pub struct Cargo {
 }
 
 impl Cargo {
-    pub fn rustdocflag(&mut self, arg: &str) -> &mut Cargo {
-        self.rustdocflags.arg(arg);
-        self
-    }
     pub fn rustflag(&mut self, arg: &str) -> &mut Cargo {
         self.rustflags.arg(arg);
         self
@@ -1470,9 +1465,6 @@ impl Cargo {
     }
 
     pub fn env(&mut self, key: impl AsRef<OsStr>, value: impl AsRef<OsStr>) -> &mut Cargo {
-        // These are managed through rustflag/rustdocflag interfaces.
-        assert_ne!(key.as_ref(), "RUSTFLAGS");
-        assert_ne!(key.as_ref(), "RUSTDOCFLAGS");
         self.command.env(key.as_ref(), value.as_ref());
         self
     }