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

bump rustfmt to v1.4.32 #81093

Merged
merged 1 commit into from
Jan 17, 2021
Merged

Conversation

calebcartwright
Copy link
Member

Fixes an indentation bug with bounds reported in #80843 (comment)

r? @Mark-Simulacrum

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 16, 2021
Cargo.lock Outdated
@@ -5346,7 +5346,7 @@ dependencies = [
"chrono",
"lazy_static",
"matchers",
"parking_lot 0.11.0",
"parking_lot 0.9.0",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, this seems surprising - maybe a mistake?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought so as well, but it wasn't a change I made by hand (came from x.py check)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hm, can you try reverting it by hand perhaps? if we can't get cargo to cooperate I'd like to page in some cargo folks before landing this

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done, 🤞

@calebcartwright
Copy link
Member Author

Also, looks like the bug from #80843 (comment) is on beta too so would like to nominate for backport though note that'd require backporting the commits from #81027 as well since we had to bump the rustc-ap crates

@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=iffy p=1

@bors
Copy link
Contributor

bors commented Jan 16, 2021

📌 Commit 13d77a3 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 Jan 16, 2021
@Mark-Simulacrum Mark-Simulacrum added beta-accepted Accepted for backporting to the compiler in the beta channel. beta-nominated Nominated for backporting to the compiler in the beta channel. labels Jan 16, 2021
@bors
Copy link
Contributor

bors commented Jan 16, 2021

⌛ Testing commit 13d77a3 with merge 2e46cb3...

@bors
Copy link
Contributor

bors commented Jan 17, 2021

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 2e46cb3 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 17, 2021
@bors bors merged commit 2e46cb3 into rust-lang:master Jan 17, 2021
@rustbot rustbot added this to the 1.51.0 milestone Jan 17, 2021
@Mark-Simulacrum Mark-Simulacrum modified the milestones: 1.51.0, 1.50.0 Jan 18, 2021
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 18, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 20, 2021
…ulacrum

[beta] backports

This backports:

*  Update RLS and Rustfmt rust-lang#81027
*  bump rustfmt to v1.4.32 rust-lang#81093
*  Fix handling of malicious Readers in read_to_end rust-lang#80895
*  Fix broken ./x.py install rust-lang#80514
*  Fix x.py install not working with relative prefix rust-lang#80797
*  [security] Update mdbook rust-lang#80688
*  rustdoc: Render visibilities succinctly rust-lang#80368

r? `@ghost`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. 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.

5 participants