diff options
| author | Ellen <supbscripter@gmail.com> | 2021-08-25 13:31:18 +0100 |
|---|---|---|
| committer | lcnr <rust@lcnr.de> | 2021-08-30 11:00:21 +0200 |
| commit | c0e853f274c42665373b719a5bd7b3f95afe10c2 (patch) | |
| tree | d5b4e4b153008f20bff4f75dc078d541b0d65436 /compiler | |
| parent | fcc2badf9b1e6d63c5221d206628ab1aaf3b5bdc (diff) | |
| download | rust-c0e853f274c42665373b719a5bd7b3f95afe10c2.tar.gz rust-c0e853f274c42665373b719a5bd7b3f95afe10c2.zip | |
remove lazy_normalization_consts
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/rustc_feature/src/active.rs | 3 | ||||
| -rw-r--r-- | compiler/rustc_hir/src/def.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_infer/src/infer/canonical/query_response.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_middle/src/ty/context.rs | 2 |
4 files changed, 3 insertions, 6 deletions
diff --git a/compiler/rustc_feature/src/active.rs b/compiler/rustc_feature/src/active.rs index 0e09a3fe93e..222b17615e2 100644 --- a/compiler/rustc_feature/src/active.rs +++ b/compiler/rustc_feature/src/active.rs @@ -545,9 +545,6 @@ declare_features! ( /// Allows capturing variables in scope using format_args! (active, format_args_capture, "1.46.0", Some(67984), None), - /// Lazily evaluate constants. This allows constants to depend on type parameters. - (incomplete, lazy_normalization_consts, "1.46.0", Some(72219), None), - /// Allows `if let` guard in match arms. (active, if_let_guard, "1.47.0", Some(51114), None), diff --git a/compiler/rustc_hir/src/def.rs b/compiler/rustc_hir/src/def.rs index 3816888db10..853415c4173 100644 --- a/compiler/rustc_hir/src/def.rs +++ b/compiler/rustc_hir/src/def.rs @@ -307,7 +307,7 @@ pub enum Res<Id = hir::HirId> { /// We do however allow `Self` in repeat expression even if it is generic to not break code /// which already works on stable while causing the `const_evaluatable_unchecked` future compat lint. /// - /// FIXME(lazy_normalization_consts): Remove this bodge once that feature is stable. + /// FIXME(generic_const_exprs): Remove this bodge once that feature is stable. SelfTy( /// Optionally, the trait associated with this `Self` type. Option<DefId>, diff --git a/compiler/rustc_infer/src/infer/canonical/query_response.rs b/compiler/rustc_infer/src/infer/canonical/query_response.rs index c3c28d70081..6a97a6c43c1 100644 --- a/compiler/rustc_infer/src/infer/canonical/query_response.rs +++ b/compiler/rustc_infer/src/infer/canonical/query_response.rs @@ -678,7 +678,7 @@ impl<'tcx> TypeRelatingDelegate<'tcx> for QueryTypeRelatingDelegate<'_, 'tcx> { fn const_equate(&mut self, _a: &'tcx Const<'tcx>, _b: &'tcx Const<'tcx>) { span_bug!( self.cause.span(self.infcx.tcx), - "lazy_normalization_consts: unreachable `const_equate`" + "generic_const_exprs: unreachable `const_equate`" ); } diff --git a/compiler/rustc_middle/src/ty/context.rs b/compiler/rustc_middle/src/ty/context.rs index 89542a1ebab..a9ee921399a 100644 --- a/compiler/rustc_middle/src/ty/context.rs +++ b/compiler/rustc_middle/src/ty/context.rs @@ -1421,7 +1421,7 @@ impl<'tcx> TyCtxt<'tcx> { pub fn lazy_normalization(self) -> bool { let features = self.features(); // Note: We do not enable lazy normalization for `min_const_generics`. - features.const_generics || features.lazy_normalization_consts + features.const_generics || features.generic_const_exprs } #[inline] |