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] save-analysis: Pull associated type definition using qpath_def #60881

Merged
merged 2 commits into from
May 18, 2019
Merged

[beta] save-analysis: Pull associated type definition using qpath_def #60881

merged 2 commits into from
May 18, 2019

Conversation

Xanewok
Copy link
Member

@Xanewok Xanewok commented May 16, 2019

Beta backport of #59894.

@rust-highfive
Copy link
Collaborator

r? @oli-obk

(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 May 16, 2019
@oli-obk
Copy link
Contributor

oli-obk commented May 16, 2019

r? @pietroalbini

@Centril
Copy link
Contributor

Centril commented May 16, 2019

r? @pietroalbini

1 similar comment
@pietroalbini
Copy link
Member

r? @pietroalbini

@pietroalbini
Copy link
Member

I'll merge this along with the other backports when I'll do a rollup (probably later today). By the way @Xanewok I usually take care of all the backports at once when I do a rollup, so those PRs are not strictly necessary :)

@Xanewok
Copy link
Member Author

Xanewok commented May 16, 2019

Fair enough! Just wanted to reduce some of the work needed and to make sure that it'll make its way to beta in time :)

@pietroalbini pietroalbini mentioned this pull request May 17, 2019
Merged
@pietroalbini
Copy link
Member

@bors r+ p=-1

@bors
Copy link
Contributor

bors commented May 17, 2019

📌 Commit 9401a67 has been approved by pietroalbini

@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 May 17, 2019
@bors
Copy link
Contributor

bors commented May 18, 2019

⌛ Testing commit 9401a67 with merge 4e4558dd2615c14629df4734482d012a34e4b45c...

@bors
Copy link
Contributor

bors commented May 18, 2019

💔 Test failed - status-appveyor

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 18, 2019
pietroalbini added a commit to pietroalbini/rust that referenced this pull request May 18, 2019
@pietroalbini
Rollup merge of rust-lang#60881 - Xanewok:beta-save-assoc-ty-qpath, r…
3a93dfe 
…=pietroalbini
@Xanewok
Copy link
Member Author

Xanewok commented May 18, 2019 

failures:
    client_changing_workspace_lib_retains_diagnostics
test result: FAILED. 46 passed; 1 failed; 3 ignored; 0 measured; 0 filtered out

This is spurious, I'm afraid

bors added a commit that referenced this pull request May 18, 2019
@bors
Auto merge of #60922 - pietroalbini:beta-rollup, r=pietroalbini
02b0ca3 
[beta] Rollup backports

Rolled up:

*  [beta] save-analysis: Pull associated type definition using `qpath_def` #60881
*  [beta] Update clippy #60918

Cherry-picked:

* Instead of ICEing on incorrect pattern, use delay_span_bug #60641
* Use `delay_span_bug` for "Failed to unify obligation" #60644

r? @ghost
@bors bors merged commit 9401a67 into rust-lang:beta May 18, 2019
@bors
Copy link
Contributor

bors commented May 18, 2019

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

@ehuss ehuss mentioned this pull request May 29, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@pietroalbini pietroalbini

Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@Xanewok @rust-highfive @oli-obk @Centril @pietroalbini @bors