Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[beta] resolve: Fix some stable-to-beta regressions #56206

Merged
merged 2 commits into from
Nov 25, 2018
Merged

[beta] resolve: Fix some stable-to-beta regressions #56206

merged 2 commits into from
Nov 25, 2018

Conversation

petrochenkov
Copy link
Contributor

@petrochenkov petrochenkov commented Nov 25, 2018 •
edited
Loading

Fixes #56182 (stable-to-beta regression)
Fixes #56187 (stable-to-beta regression)

@rust-highfive
Copy link
Collaborator

r? @cramertj

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

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 25, 2018
@petrochenkov petrochenkov mentioned this pull request Nov 25, 2018
Closed
@petrochenkov petrochenkov added this to the Rust 2018 Release milestone Nov 25, 2018
@petrochenkov petrochenkov mentioned this pull request Nov 25, 2018
Closed
@petrochenkov petrochenkov changed the title [beta] resolve: Fix bad span arithmetics in import conflict diagnostics [beta] resolve: Fix some stable-to-beta regressions Nov 25, 2018
@alexcrichton
Copy link
Member

@bors: r+ p=10

@bors
Copy link
Contributor

bors commented Nov 25, 2018

📌 Commit 3cf550e has been approved by alexcrichton

@bors bors 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 Nov 25, 2018
@alexcrichton
Copy link
Member

@petrochenkov thanks! Would you like to forward-port this as well to the master branch once it lands

@bors
Copy link
Contributor

bors commented Nov 25, 2018

⌛ Testing commit 3cf550e with merge 1a4f1f3...

bors added a commit that referenced this pull request Nov 25, 2018
@bors
Auto merge of #56206 - petrochenkov:betaregr, r=alexcrichton
1a4f1f3 
[beta] resolve: Fix some stable-to-beta regressions

Fixes #56182 (stable-to-beta regression)
Fixes #56187 (stable-to-beta regression)
@petrochenkov
Copy link
Contributor Author

@alexcrichton

Would you like to forward-port this as well to the master branch once it lands

Sure.

@bors
Copy link
Contributor

bors commented Nov 25, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 1a4f1f3 to beta...

@bors bors merged commit 3cf550e into rust-lang:beta Nov 25, 2018
@petrochenkov petrochenkov mentioned this pull request Nov 25, 2018
Merged
pietroalbini added a commit to pietroalbini/rust that referenced this pull request Nov 25, 2018
@pietroalbini
Rollup merge of rust-lang#56211 - petrochenkov:fwd, r=petrochenkov
cd17b1d 
[master] Forward-ports from beta

rust-lang#56206 + one commit from rust-lang#55884 that was accidentally missing in rust-lang#56042 due to an off-by-one mistake in commit ranges

r? @ghost
@petrochenkov petrochenkov deleted the betaregr branch June 5, 2019 16:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@cramertj cramertj

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
Rust 2018 Release
Development

Successfully merging this pull request may close these issues.
5 participants
@petrochenkov @rust-highfive @alexcrichton @bors @cramertj