Skip to content

Commit 9cf35bf

Browse files
committed
rustc_codegen_utils: remove symbol name dumping/checking harness, and mw impl.
1 parent 6386a31 commit 9cf35bf

File tree

8 files changed

+11
-1038
lines changed

8 files changed

+11
-1038
lines changed

Cargo.lock

-16
Original file line numberDiff line numberDiff line change
@@ -2699,7 +2699,6 @@ dependencies = [
26992699
"rustc_metadata 0.0.0",
27002700
"rustc_mir 0.0.0",
27012701
"rustc_target 0.0.0",
2702-
"std-mangle-rs 0.1.0 (git+https://github.com/michaelwoerister/std-mangle-rs?rev=e884304cfcb2f636db4d59ca8ad8fa95b983281c)",
27032702
"syntax 0.0.0",
27042703
"syntax_pos 0.0.0",
27052704
]
@@ -3336,14 +3335,6 @@ dependencies = [
33363335
"unwind 0.0.0",
33373336
]
33383337

3339-
[[package]]
3340-
name = "std-mangle-rs"
3341-
version = "0.1.0"
3342-
source = "git+https://github.com/michaelwoerister/std-mangle-rs?rev=e884304cfcb2f636db4d59ca8ad8fa95b983281c#e884304cfcb2f636db4d59ca8ad8fa95b983281c"
3343-
dependencies = [
3344-
"unic-idna-punycode 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
3345-
]
3346-
33473338
[[package]]
33483339
name = "string_cache"
33493340
version = "0.7.3"
@@ -3858,11 +3849,6 @@ name = "ucd-util"
38583849
version = "0.1.3"
38593850
source = "registry+https://github.com/rust-lang/crates.io-index"
38603851

3861-
[[package]]
3862-
name = "unic-idna-punycode"
3863-
version = "0.7.0"
3864-
source = "registry+https://github.com/rust-lang/crates.io-index"
3865-
38663852
[[package]]
38673853
name = "unicase"
38683854
version = "2.4.0"
@@ -4368,7 +4354,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
43684354
"checksum smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b73ea3738b47563803ef814925e69be00799a8c07420be8b996f8e98fb2336db"
43694355
"checksum socket2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "c4d11a52082057d87cb5caa31ad812f4504b97ab44732cd8359df2e9ff9f48e7"
43704356
"checksum stable_deref_trait 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ffbc596e092fe5f598b12ef46cc03754085ac2f4d8c739ad61c4ae266cc3b3fa"
4371-
"checksum std-mangle-rs 0.1.0 (git+https://github.com/michaelwoerister/std-mangle-rs?rev=e884304cfcb2f636db4d59ca8ad8fa95b983281c)" = "<none>"
43724357
"checksum string_cache 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "25d70109977172b127fe834e5449e5ab1740b9ba49fa18a2020f509174f25423"
43734358
"checksum string_cache_codegen 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1eea1eee654ef80933142157fdad9dd8bc43cf7c74e999e369263496f04ff4da"
43744359
"checksum string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b1884d1bc09741d466d9b14e6d37ac89d6909cbcac41dd9ae982d4d063bbedfc"
@@ -4412,7 +4397,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
44124397
"checksum typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169"
44134398
"checksum ucd-trie 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "71a9c5b1fe77426cf144cc30e49e955270f5086e31a6441dfa8b32efc09b9d77"
44144399
"checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86"
4415-
"checksum unic-idna-punycode 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1b0366615c248bc56ea5ceafe6f71a682f6591e653b1ce61814999302617b8c0"
44164400
"checksum unicase 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a84e5511b2a947f3ae965dcb29b13b7b1691b6e7332cf5dbc1744138d5acb7f6"
44174401
"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
44184402
"checksum unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6a0180bc61fc5a987082bfa111f4cc95c4caff7f9799f3e46df09163a937aa25"

src/librustc_codegen_utils/Cargo.toml

-4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,3 @@ rustc_target = { path = "../librustc_target" }
2323
rustc_data_structures = { path = "../librustc_data_structures" }
2424
rustc_metadata = { path = "../librustc_metadata" }
2525
rustc_mir = { path = "../librustc_mir" }
26-
27-
[dependencies.std-mangle-rs]
28-
git = "https://github.com/michaelwoerister/std-mangle-rs"
29-
rev = "e884304cfcb2f636db4d59ca8ad8fa95b983281c"

src/librustc_codegen_utils/symbol_names.rs

+3-15
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,7 @@ use syntax_pos::symbol::InternedString;
100100

101101
use log::debug;
102102

103-
mod dump;
104103
mod legacy;
105-
mod mw;
106104
mod v0;
107105

108106
pub fn provide(providers: &mut Providers<'_>) {
@@ -221,19 +219,9 @@ fn symbol_name(tcx: TyCtxt<'_, 'tcx, 'tcx>, instance: Instance<'tcx>) -> Interne
221219
};
222220

223221
let mangled = match mangling_version {
224-
SymbolManglingVersion::Legacy => legacy::mangle(tcx, instance, instantiating_crate, false),
225-
SymbolManglingVersion::V0 => v0::mangle(tcx, instance, instantiating_crate, true),
222+
SymbolManglingVersion::Legacy => legacy::mangle(tcx, instance, instantiating_crate),
223+
SymbolManglingVersion::V0 => v0::mangle(tcx, instance, instantiating_crate),
226224
};
227225

228-
let r = InternedString::intern(&mangled);
229-
230-
dump::record(
231-
tcx,
232-
instance,
233-
instantiating_crate,
234-
mangling_version,
235-
mangled,
236-
);
237-
238-
r
226+
InternedString::intern(&mangled)
239227
}

0 commit comments

Comments
 (0)