Skip to content

Commit c0e853f

Browse files
BoxyUwUlcnr
authored andcommitted
remove lazy_normalization_consts
1 parent fcc2bad commit c0e853f

File tree

16 files changed

+10
-114
lines changed

16 files changed

+10
-114
lines changed

compiler/rustc_feature/src/active.rs

-3
Original file line numberDiff line numberDiff line change
@@ -545,9 +545,6 @@ declare_features! (
545545
/// Allows capturing variables in scope using format_args!
546546
(active, format_args_capture, "1.46.0", Some(67984), None),
547547

548-
/// Lazily evaluate constants. This allows constants to depend on type parameters.
549-
(incomplete, lazy_normalization_consts, "1.46.0", Some(72219), None),
550-
551548
/// Allows `if let` guard in match arms.
552549
(active, if_let_guard, "1.47.0", Some(51114), None),
553550

compiler/rustc_hir/src/def.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ pub enum Res<Id = hir::HirId> {
307307
/// We do however allow `Self` in repeat expression even if it is generic to not break code
308308
/// which already works on stable while causing the `const_evaluatable_unchecked` future compat lint.
309309
///
310-
/// FIXME(lazy_normalization_consts): Remove this bodge once that feature is stable.
310+
/// FIXME(generic_const_exprs): Remove this bodge once that feature is stable.
311311
SelfTy(
312312
/// Optionally, the trait associated with this `Self` type.
313313
Option<DefId>,

compiler/rustc_infer/src/infer/canonical/query_response.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,7 @@ impl<'tcx> TypeRelatingDelegate<'tcx> for QueryTypeRelatingDelegate<'_, 'tcx> {
678678
fn const_equate(&mut self, _a: &'tcx Const<'tcx>, _b: &'tcx Const<'tcx>) {
679679
span_bug!(
680680
self.cause.span(self.infcx.tcx),
681-
"lazy_normalization_consts: unreachable `const_equate`"
681+
"generic_const_exprs: unreachable `const_equate`"
682682
);
683683
}
684684

compiler/rustc_middle/src/ty/context.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1421,7 +1421,7 @@ impl<'tcx> TyCtxt<'tcx> {
14211421
pub fn lazy_normalization(self) -> bool {
14221422
let features = self.features();
14231423
// Note: We do not enable lazy normalization for `min_const_generics`.
1424-
features.const_generics || features.lazy_normalization_consts
1424+
features.const_generics || features.generic_const_exprs
14251425
}
14261426

14271427
#[inline]

src/test/rustdoc/const-generics/lazy_normalization_consts/const-equate-pred.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#![crate_name = "foo"]
2-
#![feature(lazy_normalization_consts)]
2+
#![feature(const_generics, generic_const_exprs)]
33
#![allow(incomplete_features)]
44

55
// Checking if `Send` is implemented for `Hasher` requires us to evaluate a `ConstEquate` predicate,

src/test/ui/lazy_normalization_consts/feature-gate-lazy_normalization_consts.rs

-10
This file was deleted.

src/test/ui/lazy_normalization_consts/feature-gate-lazy_normalization_consts.stderr

-11
This file was deleted.

src/test/ui/lazy_normalization_consts/issue-47814.rs

-16
This file was deleted.

src/test/ui/lazy_normalization_consts/issue-57739.rs

-17
This file was deleted.

src/test/ui/lazy_normalization_consts/issue-57739.stderr

-19
This file was deleted.

src/test/ui/lazy_normalization_consts/issue-73980.rs

-16
This file was deleted.

src/test/ui/lazy_normalization_consts/issue-73980.stderr

-12
This file was deleted.

src/test/ui/polymorphization/promoted-function-2.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// build-fail
22
// compile-flags:-Zpolymorphize=on
33
#![crate_type = "lib"]
4-
#![feature(lazy_normalization_consts, rustc_attrs)]
5-
//~^ WARN the feature `lazy_normalization_consts` is incomplete
4+
#![feature(generic_const_exprs, rustc_attrs)]
5+
//~^ WARN the feature `generic_const_exprs` is incomplete
66

77
#[rustc_polymorphize_error]
88
fn test<T>() {

src/test/ui/polymorphization/promoted-function-2.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
warning: the feature `lazy_normalization_consts` is incomplete and may not be safe to use and/or cause compiler crashes
1+
warning: the feature `generic_const_exprs` is incomplete and may not be safe to use and/or cause compiler crashes
22
--> $DIR/promoted-function-2.rs:4:12
33
|
4-
LL | #![feature(lazy_normalization_consts, rustc_attrs)]
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^
4+
LL | #![feature(generic_const_exprs, rustc_attrs)]
5+
| ^^^^^^^^^^^^^^^^^^^
66
|
77
= note: `#[warn(incomplete_features)]` on by default
8-
= note: see issue #72219 <https://github.com/rust-lang/rust/issues/72219> for more information
8+
= note: see issue #76560 <https://github.com/rust-lang/rust/issues/76560> for more information
99

1010
error: item has unused generic parameters
1111
--> $DIR/promoted-function-2.rs:8:4

0 commit comments

Comments
 (0)