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.

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

Rollup of 6 pull requests #71600

Merged
merged 13 commits into from
Apr 27, 2020
Merged

Rollup of 6 pull requests #71600

merged 13 commits into from
Apr 27, 2020

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

shlevy and others added 13 commits April 17, 2020 17:58
Stabilize `Span::mixed_site`

Closes rust-lang#65049.
cc rust-lang#54727 (comment)

Pre-requisite for rust-lang#68717 ("Stabilize fn-like proc macros in expression, pattern and statement positions").

Stabilization report: rust-lang#68716 (comment).
…r=Xanewok

Remove unused abs_path method from rustc_span::source_map::FileLoader
…-op, r=petrochenkov

Point at the return type on `.into()` failure caused by `?`

Fix rust-lang#35946.
…ve, r=petrochenkov

add message for resolution failure because wrong namespace

closes rust-lang#71406
…chenkov

Tweak some suggestions in `rustc_resolve`
@Dylan-DPC-zz
Copy link
Author

@bors p=6 rollup=never r+

@bors
Copy link
Contributor

bors commented Apr 27, 2020

📌 Commit cddbed0 has been approved by Dylan-DPC

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 27, 2020
@bors
Copy link
Contributor

bors commented Apr 27, 2020

⌛ Testing commit cddbed0 with merge ef71df1...

@bors
Copy link
Contributor

bors commented Apr 27, 2020

☀️ Test successful - checks-azure
Approved by: Dylan-DPC
Pushing ef71df1 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 27, 2020
@bors bors merged commit ef71df1 into rust-lang:master Apr 27, 2020
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #71600!

Tested on commit ef71df1.
Direct link to PR: #71600

💔 rls on windows: test-pass → build-fail (cc @Xanewok).
💔 rls on linux: test-pass → build-fail (cc @Xanewok).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Apr 27, 2020
Tested on commit rust-lang/rust@ef71df1.
Direct link to PR: <rust-lang/rust#71600>

💔 rls on windows: test-pass → build-fail (cc @Xanewok).
💔 rls on linux: test-pass → build-fail (cc @Xanewok).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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.

9 participants