Skip to content

Commit f75be96

Browse files
committed
rustc: Move crate_disambiguator to queries
1 parent 5f343a5 commit f75be96

File tree

6 files changed

+18
-16
lines changed

6 files changed

+18
-16
lines changed

src/librustc/dep_graph/dep_node.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -535,6 +535,7 @@ define_dep_nodes!( <'tcx>
535535
[] NativeLibraries(CrateNum),
536536
[] PluginRegistrarFn(CrateNum),
537537
[] DeriveRegistrarFn(CrateNum),
538+
[] CrateDisambiguator(CrateNum),
538539
);
539540

540541
trait DepNodeParams<'a, 'gcx: 'tcx + 'a, 'tcx: 'a> : fmt::Debug {

src/librustc/middle/cstore.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,6 @@ pub trait CrateStore {
254254
/// The name of the crate as it is stored in the crate's metadata.
255255
fn original_crate_name(&self, cnum: CrateNum) -> Symbol;
256256
fn crate_hash(&self, cnum: CrateNum) -> Svh;
257-
fn crate_disambiguator(&self, cnum: CrateNum) -> Symbol;
258257

259258
// resolve
260259
fn def_key(&self, def: DefId) -> DefKey;
@@ -355,8 +354,6 @@ impl CrateStore for DummyCrateStore {
355354
bug!("original_crate_name")
356355
}
357356
fn crate_hash(&self, cnum: CrateNum) -> Svh { bug!("crate_hash") }
358-
fn crate_disambiguator(&self, cnum: CrateNum)
359-
-> Symbol { bug!("crate_disambiguator") }
360357

361358
// resolve
362359
fn def_key(&self, def: DefId) -> DefKey { bug!("def_key") }

src/librustc/ty/context.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -931,14 +931,6 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
931931
}
932932
}
933933

934-
pub fn crate_disambiguator(self, cnum: CrateNum) -> Symbol {
935-
if cnum == LOCAL_CRATE {
936-
self.sess.local_crate_disambiguator()
937-
} else {
938-
self.sess.cstore.crate_disambiguator(cnum)
939-
}
940-
}
941-
942934
pub fn alloc_generics(self, generics: ty::Generics) -> &'gcx ty::Generics {
943935
self.global_arenas.generics.alloc(generics)
944936
}

src/librustc/ty/maps.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -583,6 +583,12 @@ impl<'tcx> QueryDescription for queries::derive_registrar_fn<'tcx> {
583583
}
584584
}
585585

586+
impl<'tcx> QueryDescription for queries::crate_disambiguator<'tcx> {
587+
fn describe(_tcx: TyCtxt, _: CrateNum) -> String {
588+
format!("looking up the disambiguator a crate")
589+
}
590+
}
591+
586592
// If enabled, send a message to the profile-queries thread
587593
macro_rules! profq_msg {
588594
($tcx:expr, $msg:expr) => {
@@ -1160,6 +1166,7 @@ define_maps! { <'tcx>
11601166
[] native_libraries: NativeLibraries(CrateNum) -> Rc<Vec<NativeLibrary>>,
11611167
[] plugin_registrar_fn: PluginRegistrarFn(CrateNum) -> Option<DefId>,
11621168
[] derive_registrar_fn: DeriveRegistrarFn(CrateNum) -> Option<DefId>,
1169+
[] crate_disambiguator: CrateDisambiguator(CrateNum) -> Symbol,
11631170
}
11641171

11651172
fn type_param_predicates<'tcx>((item_id, param_id): (DefId, DefId)) -> DepConstructor<'tcx> {

src/librustc/ty/mod.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2515,6 +2515,12 @@ fn param_env<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
25152515
traits::normalize_param_env_or_error(tcx, def_id, unnormalized_env, cause)
25162516
}
25172517

2518+
fn crate_disambiguator<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
2519+
crate_num: CrateNum) -> Symbol {
2520+
assert_eq!(crate_num, LOCAL_CRATE);
2521+
tcx.sess.local_crate_disambiguator()
2522+
}
2523+
25182524
pub fn provide(providers: &mut ty::maps::Providers) {
25192525
util::provide(providers);
25202526
*providers = ty::maps::Providers {
@@ -2525,6 +2531,7 @@ pub fn provide(providers: &mut ty::maps::Providers) {
25252531
def_span,
25262532
param_env,
25272533
trait_of_item,
2534+
crate_disambiguator,
25282535
trait_impls_of: trait_def::trait_impls_of_provider,
25292536
..*providers
25302537
};

src/librustc_metadata/cstore_impl.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,9 @@ provide! { <'tcx> tcx, def_id, cdata,
172172
DefId { krate: def_id.krate, index }
173173
})
174174
}
175+
crate_disambiguator => { cdata.disambiguator() }
176+
crate_hash => { cdata.hash() }
177+
original_crate_name => { cdata.name() }
175178
}
176179

177180
pub fn provide_local<'tcx>(providers: &mut Providers<'tcx>) {
@@ -285,11 +288,6 @@ impl CrateStore for cstore::CStore {
285288
self.get_crate_hash(cnum)
286289
}
287290

288-
fn crate_disambiguator(&self, cnum: CrateNum) -> Symbol
289-
{
290-
self.get_crate_data(cnum).disambiguator()
291-
}
292-
293291
/// Returns the `DefKey` for a given `DefId`. This indicates the
294292
/// parent `DefId` as well as some idea of what kind of data the
295293
/// `DefId` refers to.

0 commit comments

Comments
 (0)