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 9 pull requests #86515

Merged
merged 23 commits into from
Jun 21, 2021
Merged

Rollup of 9 pull requests #86515

merged 23 commits into from
Jun 21, 2021

Conversation

JohnTitor
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Rustin170506 and others added 23 commits June 10, 2021 14:42
…matsakis

Make OR_PATTERNS_BACK_COMPAT be a 2021 future-incompatible lint

close rust-lang#84869

r? `@nikomatsakis`
…acrum

Add a regression test for issue-85113

Fixed by rust-lang#86118, closes rust-lang#85113
…ark-Simulacrum

Add regression test for issue rust-lang#78632

Add regression test for issue rust-lang#78632

Closes rust-lang#78632

Took this test from rust-lang#78632 (what was committed to glacier in rust-lang#78632 (comment)).

Tested that the we get ICE on 1.52.1 on the playground (https://play.rust-lang.org/?version=stable&mode=debug&edition=2018&gist=b86d51fee4cded9d24b50d8ecbc48c6a).
…ion, r=Mark-Simulacrum

rustfmt: load nested out-of-line mods correctly

This should address rust-lang/rustfmt#4874

r? `@Mark-Simulacrum`

Decided to make the change directly in tree here for expediency/to minimize any potential backporting issues, and because there's some subtree sync items I need to get resolved before pulling from r-l/rustfmt
…roalbini

Fix CI to fetch master on beta channel

This forward-ports a fix from the beta channel (landing in rust-lang#86413, hopefully) to master so that we don't need to apply it on each round of backports.

This bug also demonstrates that our channel-checking is a bit insufficient -- stable is checked, but beta has some of its own peculiarities currently and isn't checked. But this does not attempt to adjust for that; we likely can't afford to run both beta and stable channels by CI and the current state here seems OK for now.

r? `@pietroalbini`
…=jyn514

Rustdoc: Account for const-unstable functions

Fixes rust-lang#86464
Improve `proc_macro::{Punct, Spacing}` documentation

I noticed some misspellings and then thought I could improve it a bit overall.
…llaumeGomez

Fix rust.css fonts.

The `rust.css` file (used for all non-rustdoc and non-mdbook pages) has gotten out of sync with rustdoc's css. The two share the same fonts, so this updates them to match what rustdoc uses.

It would be ideal not to need this at all, but that's for another time.
@rustbot rustbot added the rollup A PR which is a rollup label Jun 21, 2021
@JohnTitor
Copy link
Member Author

@bors r+ p=9 rollup=never

@bors
Copy link
Contributor

bors commented Jun 21, 2021

📌 Commit 599e8a7 has been approved by JohnTitor

@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 Jun 21, 2021
@bors
Copy link
Contributor

bors commented Jun 21, 2021

⌛ Testing commit 599e8a7 with merge 3912083821c5072f700a75589c8af6a9d3e20a21...

@bors
Copy link
Contributor

bors commented Jun 21, 2021

☀️ Test successful - checks-actions
Approved by: JohnTitor
Pushing 3912083821c5072f700a75589c8af6a9d3e20a21 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 21, 2021
@bors
Copy link
Contributor

bors commented Jun 21, 2021

👀 Test was successful, but fast-forwarding failed: 422 Update is not a fast forward

@JohnTitor
Copy link
Member Author

@bors retry

@bors
Copy link
Contributor

bors commented Jun 21, 2021

⌛ Testing commit 599e8a7 with merge 406d4a9...

@bors
Copy link
Contributor

bors commented Jun 21, 2021

☀️ Test successful - checks-actions
Approved by: JohnTitor
Pushing 406d4a9 to master...

@bors bors merged commit 406d4a9 into rust-lang:master Jun 21, 2021
@rustbot rustbot added this to the 1.55.0 milestone Jun 21, 2021
@JohnTitor JohnTitor deleted the rollup-axzb4xh branch June 21, 2021 22:28
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.

10 participants