Merge branch 'main' into main

Author: CXWorks

Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "rustc-demangle"
-version = "0.1.23"
+version = "0.1.24"
 authors = ["Alex Crichton <[email protected]>"]
 license = "MIT/Apache-2.0"
 readme = "README.md"
-repository = "https://github.com/alexcrichton/rustc-demangle"
-homepage = "https://github.com/alexcrichton/rustc-demangle"
+repository = "https://github.com/rust-lang/rustc-demangle"
+homepage = "https://github.com/rust-lang/rustc-demangle"
 documentation = "https://docs.rs/rustc-demangle"
 description = """
 Rust compiler symbol demangling.

src/v0.rs

@@ -803,7 +803,7 @@ impl<'a, 'b, 's> Printer<'a, 'b, 's> {
 
                 self.print(name)?;
                 if let Some(out) = &mut self.out {
-                    if !out.alternate() {
+                    if !out.alternate() && dis != 0 {
                         out.write_str("[")?;
                         fmt::LowerHex::fmt(&dis, out)?;
                         out.write_str("]")?;
@@ -1271,7 +1271,7 @@ mod tests {
             t_const!($mangled, $value);
             t!(
                 concat!("_RIC0K", $mangled, "E"),
-                concat!("[0]::<", $value, $value_ty_suffix, ">")
+                concat!("::<", $value, $value_ty_suffix, ">")
             );
         }};
     }
@@ -1282,6 +1282,12 @@ mod tests {
         t_nohash!("__RNvC6_123foo3bar", "123foo::bar");
     }
 
+    #[test]
+    fn demangle_crate_with_zero_disambiguator() {
+        t!("_RC4f128", "f128");
+        t_nohash!("_RC4f128", "f128");
+    }
+
     #[test]
     fn demangle_utf8_idents() {
         t_nohash!(