diff options
| author | Ellen <supbscripter@gmail.com> | 2021-08-25 10:21:39 +0100 |
|---|---|---|
| committer | lcnr <rust@lcnr.de> | 2021-08-30 11:00:21 +0200 |
| commit | fcc2badf9b1e6d63c5221d206628ab1aaf3b5bdc (patch) | |
| tree | 22cb7d48f1b3958d1edd0a15f3f4cba23907f93e /compiler/rustc_resolve/src/lib.rs | |
| parent | dbb0fe9d803f7fa8688b33306266a6b054c2c3f4 (diff) | |
| download | rust-fcc2badf9b1e6d63c5221d206628ab1aaf3b5bdc.tar.gz rust-fcc2badf9b1e6d63c5221d206628ab1aaf3b5bdc.zip | |
rename const_evaluatable_checked to generic_const_exprs
:sparkles:
Diffstat (limited to 'compiler/rustc_resolve/src/lib.rs')
| -rw-r--r-- | compiler/rustc_resolve/src/lib.rs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/compiler/rustc_resolve/src/lib.rs b/compiler/rustc_resolve/src/lib.rs index e308ea1a1be..fc8fcf759ad 100644 --- a/compiler/rustc_resolve/src/lib.rs +++ b/compiler/rustc_resolve/src/lib.rs @@ -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( |