bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rename const_evaluatable_checked to generic_const_exprs

Browse source 
✨
This commit is contained in:
Ellen 2021-08-25 10:21:39 +01:00 • committed by lcnr
parent dbb0fe9d80
commit fcc2badf9b
146 changed files with 178 additions and 213 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_resolve/src/diagnostics.rs
View file

@ -506,8 +506,8 @@ impl<'a> Resolver<'a> {
if self.session.is_nightly_build() {
err.help(
"use `#![feature(const_generics)]` and `#![feature(const_evaluatable_checked)]` \
to allow generic const expressions"
"use `#![feature(const_generics)]` and `#![feature(generic_const_exprs)]` \
to allow generic const expressions",
);
}

8
compiler/rustc_resolve/src/lib.rs
View file

@ -2734,9 +2734,7 @@ impl<'a> Resolver<'a> {
ConstantItemRibKind(trivial, _) => {
let features = self.session.features_untracked();
// HACK(min_const_generics): We currently only allow `N` or `{ N }`.
if !(trivial
|| features.const_generics
|| features.lazy_normalization_consts)
if !(trivial || features.const_generics || features.generic_const_exprs)
{
// HACK(min_const_generics): If we encounter `Self` in an anonymous constant
// we can't easily tell if it's generic at this stage, so we instead remember
@ -2809,9 +2807,7 @@ impl<'a> Resolver<'a> {
ConstantItemRibKind(trivial, _) => {
let features = self.session.features_untracked();
// HACK(min_const_generics): We currently only allow `N` or `{ N }`.
if !(trivial
|| features.const_generics
|| features.lazy_normalization_consts)
if !(trivial || features.const_generics || features.generic_const_exprs)
{
if record_used {
self.report_error(