Correctly format extern crate conflict resolution help#47767
Merged
bors merged 2 commits intorust-lang:masterfrom Jan 28, 2018
Merged
Correctly format extern crate conflict resolution help#47767bors merged 2 commits intorust-lang:masterfrom
extern crate conflict resolution help#47767bors merged 2 commits intorust-lang:masterfrom
Conversation
Contributor
|
r? @pnkfelix (rust_highfive has picked a reviewer for you, use r? to override) |
estebank
force-pushed
the
as-suggestion
branch
from
7e13d07 to
0e5a333
Compare
estebank
force-pushed
the
as-suggestion
branch
from
0e5a333 to
12b4063
Compare
petrochenkov
added
the
S-waiting-on-review
estebank
force-pushed
the
as-suggestion
branch
3 times, most recently
from
e436c44 to
4b0d6ed
Compare
estebank
force-pushed
the
as-suggestion
branch
from
4b0d6ed to
445e404
Compare
Contributor
|
@bors r+ |
Collaborator
|
📌 Commit 445e404 has been approved by |
petrochenkov
added
S-waiting-on-bors
Collaborator
|
⌛ Testing commit 445e404 with merge 07e3f3bc093be1d7486e941067579d00578f48f6... |
Collaborator
|
💔 Test failed - status-travis |
Contributor
Author
@bors retry |
Collaborator
Collaborator
|
☀️ Test successful - status-appveyor, status-travis |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
Closes #45799. Follow up to @Cldfire's #45820.
If the
externstatement that will have a suggestion ends on a;, synthesize a new span that doesn't include it.