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 #63790

Merged
merged 19 commits into from
Aug 21, 2019
Merged

Rollup of 6 pull requests #63790

merged 19 commits into from
Aug 21, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Aug 21, 2019

Successful merges:

Failed merges:

r? @ghost

pietroalbini and others added 19 commits August 21, 2019 09:14
Solve the problem of `ParentScope` entries for eager expansions not exising in the resolver map by creating them on demand.
…ng an expression

Maybe it made sense when it was introduced, but now it's doing something incorrect.
…-Simulacrum

take into account the system theme

Fixes rust-lang#61079.

The CSS can now take into account the system theme. I used it to generate some content on the document and from there, if no theme has already been selected, it'll look at the system level theme.

r? @QuietMisdreavus
cc @fenhl
Fix nested eager expansions in arguments of `format_args`

Fixes rust-lang#63460
Fixes rust-lang#63685 (regression from making `format_args` opaque - rust-lang#63114)

r? @matthewjasper
…ichton

ci: move libc mirrors to the rust-lang-ci-mirrors bucket

Finishing up rust-lang#63485. Already moved the objects.

r? @alexcrichton
Improve diagnostics: break/continue in wrong context

- Fix rust-lang#63712
- Use `` `break` `` or `` `continue` `` instead of always `break` in `cannot _...`
- Show the enclosing closure or async block we're talking about
- `` `break` outside of loop `` -> `` `break` outside of a loop `` for consistency

r? @estebank
Run Clippy without json-rendered flag

Removed in rust-lang#62766

Replacing it with `--json=diagnostic-rendered-ansi` fails:
```
error: using `--json` requires also using `--error-format=json`
```
Running `./x.py clippy src/libstd` locally works fine (with colors) on Linux so I don't know if there is something to fix.
@Centril
Copy link
Contributor Author

Centril commented Aug 21, 2019

@bors r+ p=6 rollup=never

@bors
Copy link
Contributor

bors commented Aug 21, 2019

📌 Commit 1294774 has been approved by Centril

@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 Aug 21, 2019
@bors
Copy link
Contributor

bors commented Aug 21, 2019

⌛ Testing commit 1294774 with merge e44fdf9...

bors added a commit that referenced this pull request Aug 21, 2019
Rollup of 6 pull requests

Successful merges:

 - #61236 (take into account the system theme)
 - #63717 (Fix nested eager expansions in arguments of `format_args`)
 - #63747 (update Miri)
 - #63772 (ci: move libc mirrors to the rust-lang-ci-mirrors bucket)
 - #63780 (Improve diagnostics: break/continue in wrong context)
 - #63781 (Run Clippy without json-rendered flag)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Aug 21, 2019

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 21, 2019
@bors bors merged commit 1294774 into rust-lang:master Aug 21, 2019
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #63790!

Tested on commit e44fdf9.
Direct link to PR: #63790

🎉 miri on windows: build-fail → test-pass (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
🎉 miri on linux: build-fail → test-pass (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Aug 21, 2019
Tested on commit rust-lang/rust@e44fdf9.
Direct link to PR: <rust-lang/rust#63790>

🎉 miri on windows: build-fail → test-pass (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
🎉 miri on linux: build-fail → test-pass (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
@Centril Centril deleted the rollup-m4ax3r9 branch August 21, 2019 21:32
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
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.

9 participants