Skip to content

Update rustfmt to 0.3.6 - #47454

Merged
bors merged 1 commit into
rust-lang:masterfrom
topecongiro:update-rustfmt
Jan 19, 2018
Merged

Update rustfmt to 0.3.6#47454
bors merged 1 commit into
rust-lang:masterfrom
topecongiro:update-rustfmt

Conversation

@topecongiro

@topecongirotopecongiro commented Jan 15, 2018

Copy link
Copy Markdown
Contributor

r? @nrc

@topecongiro

topecongiro commented Jan 16, 2018

Copy link
Copy Markdown
ContributorAuthor

Currently rustfmt and rls is missing from the nightly component. This PR brings those two back.

@kennytmkennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 17, 2018
kennytm
kennytm reviewed Jan 17, 2018
View reviewed changes
Comment threadsrc/Cargo.lock Outdated

@kennytmkennytmJan 17, 2018

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.

Since we are building rustfmt in the compiler, it's strange we in turn depend on an external, older copy of these crates; besides, these will almost always be outdated (the current version is 14, for instance).

The advantage of this is that compiler changes will less likely to break rustfmt on nightly.

Not sure if we want to r+ as-is or require a [patch] section.

@petrochenkovpetrochenkovJan 17, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I also wonder how this affects build times.

@kennytmkennytmJan 17, 2018•
edited
Loading

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.

@petrochenkov It shouldn't affect build times since those two builds don't touch rustfmt/rls.

@XanewokXanewokJan 17, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@kennytm same thing will happen to rls, however rls uses a locally-patched version of rustfmt, so I assume it'll work as intended, provided that rustfmt compiles as expected in-tree, with [patch]ed deps or not, no?

@nrcnrcJan 18, 2018

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.

It is intentional to depend on an older version of the crate, it means that breakage in libsyntax doesn't break rustfmt (and the RLS), which is the whole reason for doing this. Using [patch] would prevent that happening.

@XanewokXanewok mentioned this pull request Jan 17, 2018
Merged
@nrc

nrc commented Jan 18, 2018

Copy link
Copy Markdown
Member

@bors: r+ p=1

@bors

bors commented Jan 18, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 1f0f46e has been approved by nrc

@topecongiro

topecongiro commented Jan 18, 2018

Copy link
Copy Markdown
ContributorAuthor

@nrc rustfmt 0.3.5 has a bug which is likely to appear in many places (cc rust-lang/rustfmt#2370 and rust-lang/rustfmt#2374). As such, I am going to publish 0.3.6 and use it instead.

@kennytm

kennytm commented Jan 18, 2018

Copy link
Copy Markdown
Member

@bors r-

Waiting for author to update to 0.3.6

@kennytmkennytm added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 18, 2018
@topecongirotopecongiro changed the title Update rustfmt to 0.3.5Update rustfmt to 0.3.6Jan 18, 2018
@topecongiro

topecongiro commented Jan 18, 2018

Copy link
Copy Markdown
ContributorAuthor

Updated rustfmt to 0.3.6.

@kennytmkennytm added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Jan 18, 2018
@kennytm

kennytm commented Jan 18, 2018

Copy link
Copy Markdown
Member

@bors r=nrc

@bors

bors commented Jan 18, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 8057443 has been approved by nrc

@kennytmkennytm added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 18, 2018
@kennytm

kennytm commented Jan 18, 2018•
edited
Loading

Copy link
Copy Markdown
Member

@bors r-

@topecongiro Could you rebase on the latest master to resolve the Cargo.lock conflict? Thanks.

@bors

bors commented Jan 18, 2018

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #47280) made this pull request unmergeable. Please resolve the merge conflicts.

@topecongiro

topecongiro commented Jan 18, 2018

Copy link
Copy Markdown
ContributorAuthor

Rebased on the latest master.

@kennytmkennytm 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 18, 2018
@kennytm

kennytm commented Jan 18, 2018

Copy link
Copy Markdown
Member

@bors r=nrc

@bors

bors commented Jan 18, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 5ae8fa9 has been approved by nrc

Xanewok added a commit to Xanewok/rls that referenced this pull request Jan 18, 2018
@Xanewok
Update rustfmt to 0.3.6
abd741e
Fixes a possible bug from 0.3.5
(rust-lang/rust#47454 (comment))
and prepares the RLS repo to be updated in Rust tree.
@XanewokXanewok mentioned this pull request Jan 18, 2018
Merged
@bors

bors commented Jan 18, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 5ae8fa9 with merge f703782c49196ffa110c97ad262a8498570b5e0a...

@bors

bors commented Jan 18, 2018

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-appveyor

@kennytm

kennytm commented Jan 19, 2018

Copy link
Copy Markdown
Member

@bors retry 3 hour timeout.

@bors

bors commented Jan 19, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 5ae8fa9 with merge b71cbd8...

bors added a commit that referenced this pull request Jan 19, 2018
@bors
Auto merge of#47454- topecongiro:update-rustfmt, r=nrc
b71cbd8
Update rustfmt to 0.3.6
r? @nrc
@bors

bors commented Jan 19, 2018

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: nrc
Pushing b71cbd8 to master...

@bors
bors merged commit 5ae8fa9 into rust-lang:masterJan 19, 2018
kennytm-githubbot added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jan 19, 2018
@kennytm-githubbot
📣 Toolstate changed byrust-lang/rust#47454!
748fcc3
Tested on commit rust-lang/rust@b71cbd8.
🎉 rls on windows: build-fail → test-pass.
🎉 rls on linux: build-fail → test-pass.
🎉 rustfmt on windows: build-fail → test-pass.
🎉 rustfmt on linux: build-fail → test-pass.
@topecongiro
topecongiro deleted the update-rustfmt branch January 19, 2018 10:21
alexheretic pushed a commit to alexheretic/rls that referenced this pull request Jan 20, 2018
@Xanewok@alexheretic
Update rustfmt to 0.3.6
0b614ec
Fixes a possible bug from 0.3.5
(rust-lang/rust#47454 (comment))
and prepares the RLS repo to be updated in Rust tree.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kennytmkennytmkennytm left review comments
@petrochenkovpetrochenkovpetrochenkov left review comments
+2 more reviewers
@nrcnrcnrc left review comments
@XanewokXanewokXanewok left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@nrcnrc

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@topecongiro@nrc@bors@kennytm@Xanewok@petrochenkov