diff options
| author | Ellen <supbscripter@gmail.com> | 2022-08-01 15:42:38 +0100 |
|---|---|---|
| committer | Ellen <supbscripter@gmail.com> | 2022-08-01 15:42:38 +0100 |
| commit | 825a7cc65c4b21fd4f1b8f3b9ad204594de1e8c2 (patch) | |
| tree | cecde661d63e82a93e92a2729f7d861b466f0683 /compiler/rustc_middle/src/infer | |
| parent | 1f5d8d49eb6111931091f700d07518cd2b80bc18 (diff) | |
| download | rust-825a7cc65c4b21fd4f1b8f3b9ad204594de1e8c2.tar.gz rust-825a7cc65c4b21fd4f1b8f3b9ad204594de1e8c2.zip | |
make `PlaceholderConst` not store the type of the const
Diffstat (limited to 'compiler/rustc_middle/src/infer')
| -rw-r--r-- | compiler/rustc_middle/src/infer/canonical.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_middle/src/infer/canonical.rs b/compiler/rustc_middle/src/infer/canonical.rs index c6fe3e72103..200de9079c2 100644 --- a/compiler/rustc_middle/src/infer/canonical.rs +++ b/compiler/rustc_middle/src/infer/canonical.rs @@ -105,7 +105,7 @@ impl<'tcx> CanonicalVarInfo<'tcx> { CanonicalVarKind::Region(_) => true, CanonicalVarKind::PlaceholderRegion(..) => false, CanonicalVarKind::Const(..) => true, - CanonicalVarKind::PlaceholderConst(_) => false, + CanonicalVarKind::PlaceholderConst(_, _) => false, } } } @@ -133,7 +133,7 @@ pub enum CanonicalVarKind<'tcx> { Const(ty::UniverseIndex, Ty<'tcx>), /// A "placeholder" that represents "any const". - PlaceholderConst(ty::PlaceholderConst<'tcx>), + PlaceholderConst(ty::PlaceholderConst<'tcx>, Ty<'tcx>), } impl<'tcx> CanonicalVarKind<'tcx> { @@ -148,7 +148,7 @@ impl<'tcx> CanonicalVarKind<'tcx> { CanonicalVarKind::Region(ui) => ui, CanonicalVarKind::PlaceholderRegion(placeholder) => placeholder.universe, CanonicalVarKind::Const(ui, _) => ui, - CanonicalVarKind::PlaceholderConst(placeholder) => placeholder.universe, + CanonicalVarKind::PlaceholderConst(placeholder, _) => placeholder.universe, } } } |
