Skip to content

Conversation

estebank
Copy link
Contributor

Use span label instead of span note for single line spans in
"incompatible arm" diagnostic.

@rust-highfive
Copy link
Contributor

r? @michaelwoerister

(rust_highfive has picked a reviewer for you, use r? to override)

@bors
Copy link
Collaborator

bors commented Dec 23, 2017

☔ The latest upstream changes (presumably #46864) made this pull request unmergeable. Please resolve the merge conflicts.

@kennytm kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 23, 2017
Use span label instead of span note for single line spans in
"incompatible arm" diagnostic.
@estebank estebank force-pushed the incompatible-arm-span-label branch from 043c38e to fed4fcb Compare December 25, 2017 17:48
@Zoxc
Copy link
Contributor

Zoxc commented Dec 25, 2017

@bors r+

@bors
Copy link
Collaborator

bors commented Dec 25, 2017

📌 Commit fed4fcb has been approved by Zoxc

@kennytm kennytm added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 25, 2017
@bors
Copy link
Collaborator

bors commented Dec 26, 2017

⌛ Testing commit fed4fcb with merge fd04216a72e6e19044d7d24be53707e020c781c0...

@bors
Copy link
Collaborator

bors commented Dec 26, 2017

💔 Test failed - status-travis

@kennytm
Copy link
Member

kennytm commented Dec 26, 2017

@bors retry #47002

@bors
Copy link
Collaborator

bors commented Dec 26, 2017

⌛ Testing commit fed4fcb with merge 269827c...

bors added a commit that referenced this pull request Dec 26, 2017
"incompatible arm" diagnostic span tweak

Use span label instead of span note for single line spans in
"incompatible arm" diagnostic.
@bors
Copy link
Collaborator

bors commented Dec 26, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: Zoxc
Pushing 269827c to master...

@bors bors merged commit fed4fcb into rust-lang:master Dec 26, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants