mirror of
https://github.com/rust-lang/rust.git
synced 2025-12-30 04:45:31 +00:00
fe843feaab
`InferCtxt::next_{ty,const}_var*` all take an origin, but the
`param_def_id` is almost always `None`. This commit changes them to just
take a `Span` and build the origin within the method, and adds new
methods for the rare cases where `param_def_id` might not be `None`.
This avoids a lot of tedious origin building.
Specifically:
- next_ty_var{,_id_in_universe,_in_universe}: now take `Span` instead of
`TypeVariableOrigin`
- next_ty_var_with_origin: added
- next_const_var{,_in_universe}: takes Span instead of ConstVariableOrigin
- next_const_var_with_origin: added
- next_region_var, next_region_var_in_universe: these are unchanged,
still take RegionVariableOrigin
The API inconsistency (ty/const vs region) seems worth it for the
large conciseness improvements.
50 lines
1.7 KiB
Rust
50 lines
1.7 KiB
Rust
use rustc_infer::infer::at::At;
|
|
use rustc_infer::traits::{FulfillmentError, TraitEngine};
|
|
use rustc_macros::extension;
|
|
use rustc_middle::ty::{self, Ty};
|
|
|
|
use crate::traits::{NormalizeExt, Obligation};
|
|
|
|
#[extension(pub trait StructurallyNormalizeExt<'tcx>)]
|
|
impl<'tcx> At<'_, 'tcx> {
|
|
fn structurally_normalize(
|
|
&self,
|
|
ty: Ty<'tcx>,
|
|
fulfill_cx: &mut dyn TraitEngine<'tcx>,
|
|
) -> Result<Ty<'tcx>, Vec<FulfillmentError<'tcx>>> {
|
|
assert!(!ty.is_ty_var(), "should have resolved vars before calling");
|
|
|
|
if self.infcx.next_trait_solver() {
|
|
let ty::Alias(..) = *ty.kind() else {
|
|
return Ok(ty);
|
|
};
|
|
|
|
let new_infer_ty = self.infcx.next_ty_var(self.cause.span);
|
|
|
|
// We simply emit an `alias-eq` goal here, since that will take care of
|
|
// normalizing the LHS of the projection until it is a rigid projection
|
|
// (or a not-yet-defined opaque in scope).
|
|
let obligation = Obligation::new(
|
|
self.infcx.tcx,
|
|
self.cause.clone(),
|
|
self.param_env,
|
|
ty::PredicateKind::AliasRelate(
|
|
ty.into(),
|
|
new_infer_ty.into(),
|
|
ty::AliasRelationDirection::Equate,
|
|
),
|
|
);
|
|
|
|
fulfill_cx.register_predicate_obligation(self.infcx, obligation);
|
|
let errors = fulfill_cx.select_where_possible(self.infcx);
|
|
if !errors.is_empty() {
|
|
return Err(errors);
|
|
}
|
|
|
|
Ok(self.infcx.resolve_vars_if_possible(new_infer_ty))
|
|
} else {
|
|
Ok(self.normalize(ty).into_value_registering_obligations(self.infcx, fulfill_cx))
|
|
}
|
|
}
|
|
}
|