handle nested generics in Generics::type_param/region_param #44959
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
eddyb
reviewed
Oct 1, 2017
src/librustc/ty/mod.rs
Outdated
| param: &ParamTy, | ||
| tcx: TyCtxt<'a, 'gcx, 'tcx>) -> &TypeParameterDef { | ||
| if let Some(idx) = param.idx.checked_sub(self.parent_count() as u32) { | ||
| &self.types[idx as usize - self.has_self as usize - self.regions.len()] |
There was a problem hiding this comment.
This doesn't seem to take into account the fact that Self is at index 0 before lifetimes.
There was a problem hiding this comment.
How are you supposed to detect Self?
|
r=me w/ |
|
done |
eddyb
reviewed
Oct 2, 2017
src/librustc/ty/mod.rs
Outdated
| if let Some(idx) = (idx as usize).checked_sub(type_param_start) { | ||
| Some(&self.types[idx]) | ||
| } else { | ||
| None |
There was a problem hiding this comment.
Why not assert_eq!((idx, self.has_self), (0, true)); followed by &self.types[0]?
There was a problem hiding this comment.
idx of 1 is also mapped to 1 - 1 = 0, so I don't think &self.types[0] is correct here and Self doesn't have a TypeParameterDef.
|
@bors r+ |
|
📌 Commit 706e52e has been approved by |
|
☀️ Test successful - status-appveyor, status-travis |
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.
Fixes #44952.
r? @eddyb