Update rustc-demangle to 0.1.24
Test: m
Change-Id: I3719bf6a057e4a3c8919ed1bea22cdc83805d1e9
diff --git a/crates/rustc-demangle/.android-checksum.json b/crates/rustc-demangle/.android-checksum.json
new file mode 100644
index 0000000..a7b2d21
--- /dev/null
+++ b/crates/rustc-demangle/.android-checksum.json
@@ -0,0 +1 @@
+{"package":null,"files":{"cargo_embargo.json":"25644c9e2239d482f0457d4b6cb0f92ed570ff3d3433e412023940dfcd6282de","METADATA":"7672cafc74264ec3ca850df5807c303a0be7bcbb13f47b47f858e8b1036add6f","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","src/v0.rs":"8d1848f9b21bd70edd97952985bbc246acf4392341ed470e3ce3e9af8dada851","Cargo.toml":"3085021366dc49ca4f4d2a6cfc8516a38a1d1ca16afb2205cc088adab8620dc1","LICENSE":"3c7cd2396b5b772507febd2615d3d5a55b80103845037df77c87ba6e64872f2c","README.md":"02a93ea3842604b1eeaa03432c87fbae2aca3b9e08b84f2ac102918345bf1360","src/lib.rs":"1a512f5e4d87d641bf03d6bf945d801bcb0a2d294ef4ff6f9f909d0d2f63222c","src/v0-large-test-symbols/early-recursion-limit":"d0ffb131dbc4e5df9e7cad4bdfada47c73d8182d164acf49ef54347dc4cdb6df","LICENSE-APACHE":"3c7cd2396b5b772507febd2615d3d5a55b80103845037df77c87ba6e64872f2c","LICENSE-MIT":"f975a1d3055c02b62c0ba925c8204c30f15563946fbf252bffa3a951fb33bcf9","src/legacy.rs":"523fb3d1bdb4fab663c56aedb4e962d8452d461515f0a23c32f02194b9081891",".cargo-checksum.json":"57de72e875a33a8f8ffea369981ef80ecbe01617115e0e51fa05b2dea5943a81","Android.bp":"50aff9f4a4186bed7128d7781d45bee877b3b26965f1197700b7a6298018ba15","TEST_MAPPING":"402c64c1bed286b32380b9bb37008b1d6cd0fe04f8909e3c0bbf062a12106f9c"}}
\ No newline at end of file
diff --git a/crates/rustc-demangle/.cargo-checksum.json b/crates/rustc-demangle/.cargo-checksum.json
index 9ddcdb2..2443228 100644
--- a/crates/rustc-demangle/.cargo-checksum.json
+++ b/crates/rustc-demangle/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"f4132bc65d5e58e2f27b9f9ef197b1c286582137b65285292b75a5a230fc81c8","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"3bb7af78423e95b207beebd452cdd973d65663cf25a0fc9358c588f53783293c","src/legacy.rs":"b4d5a140ed0bf2d792431961d6fd44a21c99235489a2c9f6717d1577a42c09ce","src/lib.rs":"607fe60c1e65da3f86a0b4b8fececb7db79049a0cd4cb316492e8e6593bf39c6","src/v0-large-test-symbols/early-recursion-limit":"96861a7042db35ee0bd04802820d0f2d6a3b534ce13547912b6364001ffd1494","src/v0.rs":"4e5bd069aa61def3dc732b3a285861914895272668ddfcb6b9eef46dd5713041"},"package":"d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"}
\ No newline at end of file
+{"files":{"Cargo.toml":"1e2ff162f1fae19b2e5af0e0e3385e194c929ce98416e8b8af4b9e99412bb0d2","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"3bb7af78423e95b207beebd452cdd973d65663cf25a0fc9358c588f53783293c","src/legacy.rs":"b4d5a140ed0bf2d792431961d6fd44a21c99235489a2c9f6717d1577a42c09ce","src/lib.rs":"607fe60c1e65da3f86a0b4b8fececb7db79049a0cd4cb316492e8e6593bf39c6","src/v0-large-test-symbols/early-recursion-limit":"96861a7042db35ee0bd04802820d0f2d6a3b534ce13547912b6364001ffd1494","src/v0.rs":"bcfaed410cf8383843e2ee8fd3fd46e133cb95a330d431fe6b24062d4762074f"},"package":"719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"}
\ No newline at end of file
diff --git a/crates/rustc-demangle/Android.bp b/crates/rustc-demangle/Android.bp
index 46115e8..c0523cd 100644
--- a/crates/rustc-demangle/Android.bp
+++ b/crates/rustc-demangle/Android.bp
@@ -18,7 +18,7 @@
host_supported: true,
crate_name: "rustc_demangle",
cargo_env_compat: true,
- cargo_pkg_version: "0.1.23",
+ cargo_pkg_version: "0.1.24",
crate_root: "src/lib.rs",
edition: "2015",
features: ["std"],
@@ -42,7 +42,7 @@
host_supported: true,
crate_name: "rustc_demangle",
cargo_env_compat: true,
- cargo_pkg_version: "0.1.23",
+ cargo_pkg_version: "0.1.24",
crate_root: "src/lib.rs",
test_suites: ["general-tests"],
auto_gen_config: true,
diff --git a/crates/rustc-demangle/Cargo.toml b/crates/rustc-demangle/Cargo.toml
index 61238e3..c4e53ab 100644
--- a/crates/rustc-demangle/Cargo.toml
+++ b/crates/rustc-demangle/Cargo.toml
@@ -11,16 +11,21 @@
[package]
name = "rustc-demangle"
-version = "0.1.23"
+version = "0.1.24"
authors = ["Alex Crichton <alex@alexcrichton.com>"]
+build = false
+autobins = false
+autoexamples = false
+autotests = false
+autobenches = false
description = """
Rust compiler symbol demangling.
"""
-homepage = "https://github.com/alexcrichton/rustc-demangle"
+homepage = "https://github.com/rust-lang/rustc-demangle"
documentation = "https://docs.rs/rustc-demangle"
readme = "README.md"
license = "MIT/Apache-2.0"
-repository = "https://github.com/alexcrichton/rustc-demangle"
+repository = "https://github.com/rust-lang/rustc-demangle"
[package.metadata.docs.rs]
features = ["std"]
@@ -32,6 +37,10 @@
[profile.release]
lto = true
+[lib]
+name = "rustc_demangle"
+path = "src/lib.rs"
+
[dependencies.compiler_builtins]
version = "0.1.2"
optional = true
diff --git a/crates/rustc-demangle/METADATA b/crates/rustc-demangle/METADATA
index 69397d1..4b0da2c 100644
--- a/crates/rustc-demangle/METADATA
+++ b/crates/rustc-demangle/METADATA
@@ -1,17 +1,17 @@
name: "rustc-demangle"
description: "Rust compiler symbol demangling."
third_party {
- version: "0.1.23"
+ version: "0.1.24"
license_type: NOTICE
last_upgrade_date {
year: 2024
- month: 2
- day: 8
+ month: 12
+ day: 20
}
homepage: "https://crates.io/crates/rustc-demangle"
identifier {
type: "Archive"
- value: "https://static.crates.io/crates/rustc-demangle/rustc-demangle-0.1.23.crate"
- version: "0.1.23"
+ value: "https://static.crates.io/crates/rustc-demangle/rustc-demangle-0.1.24.crate"
+ version: "0.1.24"
}
}
diff --git a/crates/rustc-demangle/src/v0.rs b/crates/rustc-demangle/src/v0.rs
index 3e88fa6..81cbdc4 100644
--- a/crates/rustc-demangle/src/v0.rs
+++ b/crates/rustc-demangle/src/v0.rs
@@ -803,7 +803,7 @@
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 @@
t_const!($mangled, $value);
t!(
concat!("_RIC0K", $mangled, "E"),
- concat!("[0]::<", $value, $value_ty_suffix, ">")
+ concat!("::<", $value, $value_ty_suffix, ">")
);
}};
}
@@ -1282,6 +1282,12 @@
}
#[test]
+ fn demangle_crate_with_zero_disambiguator() {
+ t!("_RC4f128", "f128");
+ t_nohash!("_RC4f128", "f128");
+ }
+
+ #[test]
fn demangle_utf8_idents() {
t_nohash!(
"_RNqCs4fqI2P2rA04_11utf8_identsu30____7hkackfecea1cbdathfdh9hlq6y",
diff --git a/pseudo_crate/Cargo.lock b/pseudo_crate/Cargo.lock
index 8b5def0..d0909bb 100644
--- a/pseudo_crate/Cargo.lock
+++ b/pseudo_crate/Cargo.lock
@@ -4502,9 +4502,9 @@
[[package]]
name = "rustc-demangle"
-version = "0.1.23"
+version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
[[package]]
name = "rustc-demangle-capi"
diff --git a/pseudo_crate/Cargo.toml b/pseudo_crate/Cargo.toml
index 6484aad..96ef225 100644
--- a/pseudo_crate/Cargo.toml
+++ b/pseudo_crate/Cargo.toml
@@ -278,7 +278,7 @@
ring = "=0.17.2"
rusb = "=0.9.4"
rusqlite = "=0.29.0"
-rustc-demangle = "=0.1.23"
+rustc-demangle = "=0.1.24"
rustc-demangle-capi = "=0.1.0"
rustc-hash = "=1.1.0"
rustix = "=0.38.31"
