Skip to content

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

Merged
bors merged 2 commits into
rust-lang:betafrom
Xanewok:beta-save-assoc-ty-qpath
May 18, 2019
Merged

[beta] save-analysis: Pull associated type definition using qpath_def#60881
bors merged 2 commits into
rust-lang:betafrom
Xanewok:beta-save-assoc-ty-qpath

Conversation

@Xanewok

@Xanewok Xanewok commented May 16, 2019

Copy link
Copy Markdown
Contributor

Beta backport of #59894.

@rust-highfive

rust-highfive commented May 16, 2019

Copy link
Copy Markdown
Contributor

r? @oli-obk

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

@rust-highfive

rust-highfive commented May 16, 2019

Copy link
Copy Markdown
Contributor

⚠️ 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

oli-obk commented May 16, 2019

Copy link
Copy Markdown
Contributor

r? @pietroalbini

@rust-highfive rust-highfive assigned emilyalbini and unassigned oli-obk May 16, 2019
@Centril

Centril commented May 16, 2019

Copy link
Copy Markdown
Contributor

r? @pietroalbini

1 similar comment
@emilyalbini

emilyalbini commented May 16, 2019

Copy link
Copy Markdown
Member

r? @pietroalbini

@emilyalbini

emilyalbini commented May 16, 2019

Copy link
Copy Markdown
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

Xanewok commented May 16, 2019

Copy link
Copy Markdown
Contributor Author

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 :)

@emilyalbini emilyalbini mentioned this pull request May 17, 2019
Merged
@emilyalbini

emilyalbini commented May 17, 2019

Copy link
Copy Markdown
Member

@bors r+ p=-1

@bors

bors commented May 17, 2019

Copy link
Copy Markdown
Collaborator

📌 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

bors commented May 18, 2019

Copy link
Copy Markdown
Collaborator

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

@bors

bors commented May 18, 2019

Copy link
Copy Markdown
Collaborator

💔 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
emilyalbini added a commit to emilyalbini/rust that referenced this pull request May 18, 2019
@emilyalbini
Rollup merge of rust-lang#60881 - Xanewok:beta-save-assoc-ty-qpath, r…
3a93dfe 
…=pietroalbini
@Xanewok

Xanewok commented May 18, 2019

Copy link
Copy Markdown
Contributor Author 
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

bors commented May 18, 2019

Copy link
Copy Markdown
Collaborator

☔ 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

@emilyalbini emilyalbini

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.

6 participants

@Xanewok @rust-highfive @oli-obk @Centril @emilyalbini @bors