mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make type_var_origin take a vid

Browse Source
This commit is contained in:
Michael Goulet 2024-07-21 14:14:17 -04:00
parent fc1e7ceb4b
commit 5accaf3af4
4 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/rustc_hir_analysis/src/coherence/orphan.rs
View File

@ -517,9 +517,10 @@ impl<'tcx> TypeVisitor<TyCtxt<'tcx>> for UncoveredTyParamCollector<'_, 'tcx> {
if !ty.has_type_flags(ty::TypeFlags::HAS_TY_INFER) { if !ty.has_type_flags(ty::TypeFlags::HAS_TY_INFER) {
return; return;
} }
let Some(origin) = self.infcx.type_var_origin(ty) else { let ty::Infer(ty::TyVar(vid)) = *ty.kind() else {
return ty.super_visit_with(self); return ty.super_visit_with(self);
}; };
let origin = self.infcx.type_var_origin(vid);
if let Some(def_id) = origin.param_def_id { if let Some(def_id) = origin.param_def_id {
self.uncovered_params.insert(def_id); self.uncovered_params.insert(def_id);
} }
@ -546,9 +547,10 @@ impl<'cx, 'tcx> TypeFolder<TyCtxt<'tcx>> for TyVarReplacer<'cx, 'tcx> {
if !ty.has_type_flags(ty::TypeFlags::HAS_TY_INFER) { if !ty.has_type_flags(ty::TypeFlags::HAS_TY_INFER) {
return ty; return ty;
} }
let Some(origin) = self.infcx.type_var_origin(ty) else { let ty::Infer(ty::TyVar(vid)) = *ty.kind() else {
return ty.super_fold_with(self); return ty.super_fold_with(self);
}; };
let origin = self.infcx.type_var_origin(vid);
if let Some(def_id) = origin.param_def_id { if let Some(def_id) = origin.param_def_id {
// The generics of an `impl` don't have a parent, we can index directly. // The generics of an `impl` don't have a parent, we can index directly.
let index = self.generics.param_def_id_to_index[&def_id]; let index = self.generics.param_def_id_to_index[&def_id];

2
compiler/rustc_hir_typeck/src/fallback.rs
View File

@ -175,7 +175,7 @@ impl<'tcx> FnCtxt<'_, 'tcx> {
}; };
debug!("fallback_if_possible(ty={:?}): defaulting to `{:?}`", ty, fallback); debug!("fallback_if_possible(ty={:?}): defaulting to `{:?}`", ty, fallback);
let span = self.infcx.type_var_origin(ty).map(|origin| origin.span).unwrap_or(DUMMY_SP); let span = ty.ty_vid().map_or(DUMMY_SP, |vid| self.infcx.type_var_origin(vid).span);
self.demand_eqtype(span, ty, fallback); self.demand_eqtype(span, ty, fallback);
self.fallback_has_occurred.set(true); self.fallback_has_occurred.set(true);
true true

4
compiler/rustc_hir_typeck/src/fn_ctxt/adjust_fulfillment_errors.rs
View File

@ -338,8 +338,8 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
impl<'tcx> TypeVisitor<TyCtxt<'tcx>> for FindAmbiguousParameter<'_, 'tcx> { impl<'tcx> TypeVisitor<TyCtxt<'tcx>> for FindAmbiguousParameter<'_, 'tcx> {
type Result = ControlFlow<ty::GenericArg<'tcx>>; type Result = ControlFlow<ty::GenericArg<'tcx>>;
fn visit_ty(&mut self, ty: Ty<'tcx>) -> Self::Result { fn visit_ty(&mut self, ty: Ty<'tcx>) -> Self::Result {
if let Some(origin) = self.0.type_var_origin(ty) if let ty::Infer(ty::TyVar(vid)) = *ty.kind()
&& let Some(def_id) = origin.param_def_id && let Some(def_id) = self.0.type_var_origin(vid).param_def_id
&& let generics = self.0.tcx.generics_of(self.1) && let generics = self.0.tcx.generics_of(self.1)
&& let Some(index) = generics.param_def_id_to_index(self.0.tcx, def_id) && let Some(index) = generics.param_def_id_to_index(self.0.tcx, def_id)
&& let Some(arg) = && let Some(arg) =

14
compiler/rustc_infer/src/infer/mod.rs
View File

@ -718,17 +718,11 @@ impl<'tcx> InferCtxt<'tcx> {
t.fold_with(&mut self.freshener()) t.fold_with(&mut self.freshener())
} }
/// Returns the origin of the type variable identified by `vid`, or `None` /// Returns the origin of the type variable identified by `vid`.
/// if this is not a type variable.
/// ///
/// No attempt is made to resolve `ty`. /// No attempt is made to resolve `vid` to its root variable.
pub fn type_var_origin(&self, ty: Ty<'tcx>) -> Option<TypeVariableOrigin> { pub fn type_var_origin(&self, vid: TyVid) -> TypeVariableOrigin {
match *ty.kind() { self.inner.borrow_mut().type_variables().var_origin(vid)
ty::Infer(ty::TyVar(vid)) => {
Some(self.inner.borrow_mut().type_variables().var_origin(vid))
}
_ => None,
}
} }
pub fn freshener<'b>(&'b self) -> TypeFreshener<'b, 'tcx> { pub fn freshener<'b>(&'b self) -> TypeFreshener<'b, 'tcx> {