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 5 pull requests #66680

Merged
merged 12 commits into from
Nov 24, 2019
Merged

Rollup of 5 pull requests #66680

merged 12 commits into from
Nov 24, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Nov 23, 2019

Successful merges:

Failed merges:

r? @ghost

GuillaumeGomez and others added 12 commits November 21, 2019 15:37
It's not even stable in rustc so it shouldn't be stable in rustdoc.
It can be treated like any other unexpected IO error.
Point at type in `let` assignment on type errors

Fix rust-lang#61067.
…able, r=GuillaumeGomez

rustdoc: Mark `--extern-private` as unstable

It's not even stable in rustc so it shouldn't be stable in rustdoc.

r? @kinnison
…laumeGomez

rustdoc: Don't panic when failing to write .lock file

It can be treated like any other unexpected IO error.

I couldn't think of a good way to add a test for this unfortunately.

r? @GuillaumeGomez
Move def collector from `rustc` to `rustc_resolve`

It's used only from `rustc_resolve`, so we can move it there, thus reducing the size of `rustc` (rust-lang#65031).

It's quite possible that we can merge the def collector pass into the "build reduced graph" pass (they are always run together and do similar things), but it's some larger work.

r? @eddyb
@Centril
Copy link
Contributor Author

Centril commented Nov 23, 2019

@bors r+ p=5 rollup=never

@bors
Copy link
Contributor

bors commented Nov 23, 2019

📌 Commit c215de0 has been approved by Centril

@bors
Copy link
Contributor

bors commented Nov 23, 2019

🌲 The tree is currently closed for pull requests below priority 10, this pull request will be tested once the tree is reopened

@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 Nov 23, 2019
@Centril
Copy link
Contributor Author

Centril commented Nov 23, 2019

Let's test the waters; @bors p=100

@bors
Copy link
Contributor

bors commented Nov 23, 2019

⌛ Testing commit c215de0 with merge ad808d9...

bors added a commit that referenced this pull request Nov 23, 2019
Rollup of 5 pull requests

Successful merges:

 - #61351 (Stabilize cfg(doc))
 - #66539 (Point at type in `let` assignment on type errors)
 - #66655 (rustdoc: Mark `--extern-private` as unstable)
 - #66657 (rustdoc: Don't panic when failing to write .lock file)
 - #66673 (Move def collector from `rustc` to `rustc_resolve`)

Failed merges:

r? @ghost
@Centril Centril added the rollup A PR which is a rollup label Nov 23, 2019
@bors
Copy link
Contributor

bors commented Nov 24, 2019

☀️ Test successful - checks-azure
Approved by: Centril
Pushing ad808d9 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 24, 2019
@bors bors merged commit c215de0 into rust-lang:master Nov 24, 2019
@bors bors mentioned this pull request Nov 24, 2019
@Centril Centril deleted the rollup-1ke3svj branch November 24, 2019 01:39
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. rollup A PR which is a rollup 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.

7 participants