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.

Sign up for GitHub

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

Jump to bottom

[beta] backports #86821

Merged
merged 5 commits into from
Jul 3, 2021
Merged

[beta] backports #86821

merged 5 commits into from
Jul 3, 2021

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Jul 2, 2021

r? @Mark-Simulacrum

calebcartwright and others added 5 commits July 2, 2021 11:50
@calebcartwright @cuviper
fix(rustfmt): load nested out-of-line mods correctly
075fd93 
(cherry picked from commit d2f2237)
@pnkfelix @cuviper
Re-add support for parsing (and pretty-printing) inner-attributes wit…
3f94559 
…hin body of a `match`.

In other words, we can do `match EXPR { #![inner_attr] ARM_1 ARM_2 ... }` again.

I believe this unbreaks the only four crates that crater flagged as broken by PR 83312.

(I am putting this up so that the lang-team can check it out and decide whether
it changes their mind about what to do regarding PR 83312.)

(cherry picked from commit 75d6293)
@pnkfelix @cuviper
Updates to tests.
5b3a266 
(cherry picked from commit 8ce761d)
@jsha @cuviper
Revert "List trait impls before methods from deref in the sidebar of …
e6837eb 
…Rustdoc's output"

This reverts commit 8a05892.

(cherry picked from commit 093e246)
@GuillaumeGomez @cuviper
Revert "Don't load all extern crates unconditionally"
d78e83a 
(cherry picked from commit 5f0c54d)
@rust-highfive
Copy link
Collaborator

Some changes occurred in src/tools/rustfmt.

cc @calebcartwright

Some changes occurred in intra-doc-links.

cc @jyn514

@rust-highfive
Copy link
Collaborator

⚠️ 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 Jul 2, 2021
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=never

FWIW I usually update labels and milestones when opening these PRs (rather than after merging) since it's easier to remember that way, but up to you. Ideally we'd automate it but not quite there yet.

@bors
Copy link
Contributor

bors commented Jul 2, 2021

📌 Commit d78e83a has been approved by Mark-Simulacrum

@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 Jul 2, 2021
@cuviper cuviper linked an issue Jul 2, 2021 that may be closed by this pull request
add back support for inner attributes on non-block expressions? #84879
Closed
@bors
Copy link
Contributor

bors commented Jul 2, 2021

⌛ Testing commit d78e83a with merge 0fa28ce...

@bors
Copy link
Contributor

bors commented Jul 3, 2021

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 0fa28ce to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 3, 2021
@bors bors merged commit 0fa28ce into rust-lang:beta Jul 3, 2021
@rustbot rustbot added this to the 1.54.0 milestone Jul 3, 2021
@cuviper cuviper deleted the beta-next branch September 14, 2021 21:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

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
Milestone
1.54.0
Development

Successfully merging this pull request may close these issues.

add back support for inner attributes on non-block expressions?
9 participants
@cuviper @rust-highfive @Mark-Simulacrum @bors @rustbot @calebcartwright @pnkfelix @jsha @GuillaumeGomez