allow concrete self types in consts #76195
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rust-highfive
added
the
S-waiting-on-review
lcnr
commented
Sep 1, 2020
This comment has been minimized.
This comment has been minimized.
estebank
approved these changes
Sep 8, 2020
Comment on lines
+114
to
116
| /// The `bool` indicates if this constant may reference generic parameters | ||
| /// and is used to only allow generic parameters to be used in trivial constant expressions. | ||
| ConstantItemRibKind(bool), |
There was a problem hiding this comment.
Ideally this would be a new enum, but it is great you added docs to it.
compiler/rustc_resolve/src/lib.rs
Outdated
Comment on lines
2618
to
2626
| if self.session.features_untracked().min_const_generics { | ||
| // HACK(min_const_generics): We currently only allow `N` or `{ N }`. | ||
| if !trivial { | ||
| // 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 | ||
| // this and then enforce the self type to be concrete later on. | ||
| if let Res::SelfTy(trait_def, Some((impl_def, _))) = res { | ||
| res = Res::SelfTy(trait_def, Some((impl_def, true))); | ||
| } else { |
There was a problem hiding this comment.
What do you think of this @petrochenkov?
It seems sketchy as hell, but likely "correct", and being gated behing min_const_generics I am inclined at allowing as is.
lcnr
force-pushed
the
const-Self
branch
2 times, most recently
from
8271d7c to
c71f90e
Compare
|
✔️ review |
lcnr
commented
Sep 8, 2020
|
I'm going to approve: if @petrochenkov has any comments later, we can address them in a follow up. @bors r+ |
|
📌 Commit f32593b5d5693d11c582240cf14ada7bb06201aa has been approved by |
bors
added
S-waiting-on-bors
|
⌛ Testing commit f32593b5d5693d11c582240cf14ada7bb06201aa with merge b40adb3fedaabc8291fcc5a429b101336bf2ed5f... |
|
💔 Test failed - checks-actions |
bors
added
S-waiting-on-review
|
blessed new tests @bors r=varkor |
|
📌 Commit 90dd798 has been approved by |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions, checks-azure |
lcnr
added
F-const_generics
16 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is quite a bad hack to fix #75486. There might be a better way to check if the self type depends on generic parameters, but I wasn't able to come up with one.
r? @varkor cc @petrochenkov