syntax: use an index in CodeMap instead of Gc for ExpnInfo. #17314
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
force-pushed
the
span-no-gc
branch
2 times, most recently
from
ad7ec1e to
8b7847c
Compare
| pub fn record_expansion(&self, expn_info: ExpnInfo) -> ExpnId { | ||
| let mut expansions = self.expansions.borrow_mut(); | ||
| expansions.push(expn_info); | ||
| ExpnId(expansions.len().to_u32().unwrap() - 1) |
There was a problem hiding this comment.
as u32? (If you're doing this for verification/assertion purposes, .expect("too many ExpnInfo's") would be better.)
There was a problem hiding this comment.
Also, minor point: this will break all the NO_EXPANSIONs if 232 - 1 elements are inserted.
There was a problem hiding this comment.
No, it would break if 232 elements are inserted, which is what I'm checking for (I will switch to expect).
eddyb
force-pushed
the
span-no-gc
branch
3 times, most recently
from
4f26f69 to
0db5292
Compare
| loop { | ||
| let expn_info = self.codemap().with_expn_info(expn_id, |ei| { | ||
| ei.map(|ei| (ei.call_site, ei.callee.name.as_slice() == "include")) | ||
| }) |
|
Also: |
| } | ||
| Ok(()) | ||
| let cs = try!(cm.with_expn_info(sp.expn_id, |expn_info| match expn_info { | ||
| Some(ei) => { |
There was a problem hiding this comment.
Could be Ok(expn_info.map(|ei| { ... })) rather than a match.
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.
No description provided.