Add the ability to merge spans to codemap #36585
Merged
Conversation
This file contains 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
nrc
reviewed
Sep 20, 2016
| if let Some(_) = cm.merge_spans(span1, span2) { | ||
| assert!(false); | ||
| } | ||
| else { |
There was a problem hiding this comment.
In fact you don't need the else branch at all, and you can use panic!() instead of assert!(false)
There was a problem hiding this comment.
or assert!(cm.merge_spans(span1, span2).is_none())
nrc
reviewed
Sep 20, 2016
| /// For this to work, the spans have to be: | ||
| /// * the expn_id of both spans much match | ||
| /// * the lhs span needs to end on the same line the rhs span begins | ||
| /// * the lhs span must start at or before the rhs span |
There was a problem hiding this comment.
Do you expect spans to overlap sometimes? The only time I would expect that is if one is strictly larger than the other, in which case maybe this method shouldn't be used. If you agree, you could be stricter and require the sp.lhs.hi < sp.rhs.lo, rather than comparing both los
|
@nrc - comments addressed. I check for overlap now. Simplified the negative unit test also. |
|
@bors r=nrc |
|
📌 Commit e4b1842 has been approved by |
sophiajt
pushed a commit
to sophiajt/rust
that referenced
this pull request
Sep 21, 2016
…, r=nrc Add the ability to merge spans to codemap This PR adds the ability to merge Spans. To do so, it builds on the Codemap's ability to verify the locations of spans, namely that following can be verified: * the expn_id of both spans much match * the lhs span needs to end on the same line the rhs span begins * the lhs span must start at or before the rhs span If all of these are met, a new span is returned that is min(lo), max(hi) of the two spans. This PR also removes an older Span merge, as this new functionality subsumes it. r? @nrc
sophiajt
pushed a commit
to sophiajt/rust
that referenced
this pull request
Sep 21, 2016
…, r=nrc Add the ability to merge spans to codemap This PR adds the ability to merge Spans. To do so, it builds on the Codemap's ability to verify the locations of spans, namely that following can be verified: * the expn_id of both spans much match * the lhs span needs to end on the same line the rhs span begins * the lhs span must start at or before the rhs span If all of these are met, a new span is returned that is min(lo), max(hi) of the two spans. This PR also removes an older Span merge, as this new functionality subsumes it. r? @nrc
bors
added a commit
that referenced
this pull request
Sep 22, 2016
Add the ability to merge spans to codemap This PR adds the ability to merge Spans. To do so, it builds on the Codemap's ability to verify the locations of spans, namely that following can be verified: * the expn_id of both spans much match * the lhs span needs to end on the same line the rhs span begins * the lhs span must start at or before the rhs span If all of these are met, a new span is returned that is min(lo), max(hi) of the two spans. This PR also removes an older Span merge, as this new functionality subsumes it. r? @nrc
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 PR adds the ability to merge Spans. To do so, it builds on the Codemap's ability to verify the locations of spans, namely that following can be verified:
If all of these are met, a new span is returned that is min(lo), max(hi) of the two spans.
This PR also removes an older Span merge, as this new functionality subsumes it.
r? @nrc