bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Merge CrateDisambiguator into StableCrateId

Browse source
This commit is contained in:
bjorn3 2021-05-29 12:09:23 +02:00
parent d93b6a4598
commit d0ec85d3fb
30 changed files with 125 additions and 207 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/rustc_ty_utils/src/ty.rs
View file

@ -6,7 +6,6 @@ use rustc_middle::ty::subst::Subst;
use rustc_middle::ty::{
self, Binder, Predicate, PredicateKind, ToPredicate, Ty, TyCtxt, WithConstness,
};
use rustc_session::CrateDisambiguator;
use rustc_span::symbol::Symbol;
use rustc_span::Span;
use rustc_trait_selection::traits;
@ -389,11 +388,6 @@ fn param_env_reveal_all_normalized(tcx: TyCtxt<'_>, def_id: DefId) -> ty::ParamE
tcx.param_env(def_id).with_reveal_all_normalized(tcx)
}
fn crate_disambiguator(tcx: TyCtxt<'_>, crate_num: CrateNum) -> CrateDisambiguator {
assert_eq!(crate_num, LOCAL_CRATE);
tcx.sess.local_crate_disambiguator()
}
fn original_crate_name(tcx: TyCtxt<'_>, crate_num: CrateNum) -> Symbol {
assert_eq!(crate_num, LOCAL_CRATE);
tcx.crate_name
@ -544,7 +538,6 @@ pub fn provide(providers: &mut ty::query::Providers) {
param_env,
param_env_reveal_all_normalized,
trait_of_item,
crate_disambiguator,
original_crate_name,
instance_def_size_estimate,
issue33140_self_ty,