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

Actually visit/fold the types inside CanonicalVarInfos

Browse Source
This commit is contained in:
Oli Scherer 2022-09-19 14:00:34 +00:00
parent cf6366baba
commit 18ab705073
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
compiler/rustc_middle/src/infer/canonical.rs
View File

@ -29,7 +29,7 @@
use rustc_macros::HashStable; use rustc_macros::HashStable;
use smallvec::SmallVec; use smallvec::SmallVec;
use std::iter; use std::iter;
use std::ops::Index; use std::ops::{ControlFlow, Index};
/// A "canonicalized" type `V` is one where all free inference /// A "canonicalized" type `V` is one where all free inference
/// variables have been rewritten to "canonical vars". These are /// variables have been rewritten to "canonical vars". These are
@ -44,6 +44,21 @@ pub struct Canonical<'tcx, V> {
pub type CanonicalVarInfos<'tcx> = &'tcx List<CanonicalVarInfo<'tcx>>; pub type CanonicalVarInfos<'tcx> = &'tcx List<CanonicalVarInfo<'tcx>>;
impl<'tcx> ty::TypeFoldable<'tcx> for CanonicalVarInfos<'tcx> {
fn try_fold_with<F: ty::FallibleTypeFolder<'tcx>>(
self,
folder: &mut F,
) -> Result<Self, F::Error> {
ty::util::fold_list(self, folder, |tcx, v| tcx.intern_canonical_var_infos(v))
}
}
impl<'tcx> ty::TypeVisitable<'tcx> for CanonicalVarInfos<'tcx> {
fn visit_with<V: ty::TypeVisitor<'tcx>>(&self, visitor: &mut V) -> ControlFlow<V::BreakTy> {
self.iter().try_for_each(|t| t.visit_with(visitor))
}
}
/// A set of values corresponding to the canonical variables from some /// A set of values corresponding to the canonical variables from some
/// `Canonical`. You can give these values to /// `Canonical`. You can give these values to
/// `canonical_value.substitute` to substitute them into the canonical /// `canonical_value.substitute` to substitute them into the canonical
@ -305,12 +320,6 @@ pub fn unchecked_map<W>(self, map_op: impl FnOnce(V) -> W) -> Canonical<'tcx, W>
} }
} }
TrivialTypeTraversalImpls! {
for <'tcx> {
crate::infer::canonical::CanonicalVarInfos<'tcx>,
}
}
impl<'tcx> CanonicalVarValues<'tcx> { impl<'tcx> CanonicalVarValues<'tcx> {
#[inline] #[inline]
pub fn len(&self) -> usize { pub fn len(&self) -> usize {