Skip to content

bump rustfmt to v1.4.32 - #81093

Merged
bors merged 1 commit into
rust-lang:masterfrom
calebcartwright:update-rustfmt
Jan 17, 2021
Merged

bump rustfmt to v1.4.32#81093
bors merged 1 commit into
rust-lang:masterfrom
calebcartwright:update-rustfmt

Conversation

@calebcartwright

@calebcartwrightcalebcartwright commented Jan 16, 2021

Copy link
Copy Markdown
Member

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

r? @Mark-Simulacrum

@rust-highfive

rust-highfive commented Jan 16, 2021

Copy link
Copy Markdown
Contributor

⚠️Warning⚠️

  • These commits modify submodules.

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 16, 2021
Mark-Simulacrum
Mark-Simulacrum reviewed Jan 16, 2021
View reviewed changes
Comment threadCargo.lock Outdated

@Mark-SimulacrumMark-SimulacrumJan 16, 2021

Copy link
Copy Markdown
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?

@calebcartwrightcalebcartwrightJan 16, 2021

Copy link
Copy Markdown
MemberAuthor

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)

@Mark-SimulacrumMark-SimulacrumJan 16, 2021

Copy link
Copy Markdown
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

@calebcartwrightcalebcartwrightJan 16, 2021

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

done, 🤞

@calebcartwright

calebcartwright commented Jan 16, 2021

Copy link
Copy Markdown
MemberAuthor

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

Mark-Simulacrum commented Jan 16, 2021

Copy link
Copy Markdown
Member

@bors r+ rollup=iffy p=1

@bors

bors commented Jan 16, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 13d77a3 has been approved by Mark-Simulacrum

@borsbors 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-SimulacrumMark-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
@Mark-SimulacrumMark-Simulacrum mentioned this pull request Jan 16, 2021
Merged
@bors

bors commented Jan 16, 2021

Copy link
Copy Markdown
Collaborator

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

@bors

bors commented Jan 17, 2021

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jan 17, 2021
@bors
bors merged commit 2e46cb3 into rust-lang:masterJan 17, 2021
@rustbotrustbot added this to the 1.51.0 milestone Jan 17, 2021
@borsbors mentioned this pull request Jan 17, 2021
Closed
@Mark-SimulacrumMark-Simulacrum modified the milestones: 1.51.0, 1.50.0Jan 18, 2021
@Mark-SimulacrumMark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 18, 2021
@Mark-SimulacrumMark-Simulacrum mentioned this pull request Jan 18, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 20, 2021
@bors
Auto merge ofrust-lang#81151- Mark-Simulacrum:beta-next, r=Mark-Sim…
1cd0303
…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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Mark-SimulacrumMark-SimulacrumMark-Simulacrum left review comments

Assignees

@Mark-SimulacrumMark-Simulacrum

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

1.50.0

Development

Successfully merging this pull request may close these issues.

5 participants

@calebcartwright@rust-highfive@Mark-Simulacrum@bors@rustbot