diff options
| author | Ellen <supbscripter@gmail.com> | 2022-08-01 20:15:58 +0100 |
|---|---|---|
| committer | Ellen <supbscripter@gmail.com> | 2022-08-01 20:15:58 +0100 |
| commit | 49d001c5f364193350f5ef92522f3be7828e34e8 (patch) | |
| tree | c6e05659068d243178b6352f93a8e36faa8ae387 | |
| parent | 825a7cc65c4b21fd4f1b8f3b9ad204594de1e8c2 (diff) | |
| download | rust-49d001c5f364193350f5ef92522f3be7828e34e8.tar.gz rust-49d001c5f364193350f5ef92522f3be7828e34e8.zip | |
fmt...
| -rw-r--r-- | compiler/rustc_infer/src/infer/canonical/canonicalizer.rs | 15 | ||||
| -rw-r--r-- | compiler/rustc_trait_selection/src/traits/project.rs | 5 |
2 files changed, 11 insertions, 9 deletions
diff --git a/compiler/rustc_infer/src/infer/canonical/canonicalizer.rs b/compiler/rustc_infer/src/infer/canonical/canonicalizer.rs index 30a46de5e51..ca7862c9dc4 100644 --- a/compiler/rustc_infer/src/infer/canonical/canonicalizer.rs +++ b/compiler/rustc_infer/src/infer/canonical/canonicalizer.rs @@ -511,7 +511,9 @@ impl<'cx, 'tcx> TypeFolder<'tcx> for Canonicalizer<'cx, 'tcx> { } ty::ConstKind::Placeholder(placeholder) => { return self.canonicalize_const_var( - CanonicalVarInfo { kind: CanonicalVarKind::PlaceholderConst(placeholder, ct.ty()) }, + CanonicalVarInfo { + kind: CanonicalVarKind::PlaceholderConst(placeholder, ct.ty()), + }, ct, ); } @@ -696,10 +698,13 @@ impl<'cx, 'tcx> Canonicalizer<'cx, 'tcx> { }) } CanonicalVarKind::PlaceholderConst(placeholder, t) => { - CanonicalVarKind::PlaceholderConst(ty::Placeholder { - universe: reverse_universe_map[&placeholder.universe], - ..placeholder - }, t) + CanonicalVarKind::PlaceholderConst( + ty::Placeholder { + universe: reverse_universe_map[&placeholder.universe], + ..placeholder + }, + t, + ) } }, }) diff --git a/compiler/rustc_trait_selection/src/traits/project.rs b/compiler/rustc_trait_selection/src/traits/project.rs index c4b7c2ea638..9c2f1371b02 100644 --- a/compiler/rustc_trait_selection/src/traits/project.rs +++ b/compiler/rustc_trait_selection/src/traits/project.rs @@ -744,10 +744,7 @@ impl<'tcx> TypeFolder<'tcx> for BoundVarReplacer<'_, 'tcx> { } ty::ConstKind::Bound(debruijn, bound_const) if debruijn >= self.current_index => { let universe = self.universe_for(debruijn); - let p = ty::PlaceholderConst { - universe, - name: bound_const, - }; + let p = ty::PlaceholderConst { universe, name: bound_const }; self.mapped_consts.insert(p, bound_const); self.infcx .tcx |