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

Add dev fmt subcommand #4232

Merged
merged 10 commits into from Jul 13, 2019
Merged

Add dev fmt subcommand #4232

merged 10 commits into from Jul 13, 2019

Conversation

ghost
Copy link

@ghost ghost commented Jun 25, 2019

changelog: none

@ghost
Copy link
Author

ghost commented Jun 25, 2019

I forgot to say that this addresses #3835
This commit doesn't include any component/toolchain checking but it should still be useful.

yaahc
yaahc reviewed Jun 25, 2019
View reviewed changes
tests/fmt.rs Show resolved Hide resolved
@flip1995 flip1995 added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label Jun 26, 2019
@flip1995
Copy link
Member

flip1995 commented Jul 2, 2019

LGTM! With the tests/fmt.rs test, we could probably clean up the ci/base-tests.sh.

Are you still motivated to add the toolchain+component checking in this PR or should we merge this now and include that later?

flip1995
flip1995 reviewed Jul 2, 2019
View reviewed changes
tests/fmt.rs Outdated Show resolved Hide resolved
@ghost
Copy link
Author

ghost commented Jul 3, 2019

Are you still motivated to add the toolchain+component checking in this PR or should we merge this now and include that later?

Let's merge this now.

@flip1995
Copy link
Member

flip1995 commented Jul 3, 2019

Everything from here can also be removed:
https://github.com/rust-lang/rust-clippy/pull/4232/files#diff-ce18faa8208e5babb77318549d5c101fL54

@flip1995
Copy link
Member

flip1995 commented Jul 4, 2019

Great work, thanks!

@bors r+

@bors
Copy link
Contributor

bors commented Jul 4, 2019

📌 Commit 85fcbdc has been approved by flip1995

@bors
Copy link
Contributor

bors commented Jul 4, 2019

⌛ Testing commit 85fcbdc with merge 7292e29...

bors added a commit that referenced this pull request Jul 4, 2019
@bors
Auto merge of #4232 - mikerite:dev-fmt-4, r=flip1995
7292e29 
Add dev fmt subcommand

changelog: none
@bors
Copy link
Contributor

bors commented Jul 4, 2019

💔 Test failed - status-appveyor

@flip1995
Copy link
Member

flip1995 commented Jul 4, 2019 •
edited
Loading

https://ci.appveyor.com/project/rust-lang-libs/rust-clippy/builds/25748824#L854

Oh no. Didn't you work on this same problem for the dogfood test @mikerite?

@ghost
Copy link
Author

ghost commented Jul 5, 2019

Yes, it's the same as the problem we had with dogfood. Specifying the version of cargo to use should fix it.

@flip1995
Copy link
Member

flip1995 commented Jul 5, 2019

@bors r+ let's try again then.

@bors
Copy link
Contributor

bors commented Jul 5, 2019

📌 Commit 9ba054d has been approved by flip1995

@bors
Copy link
Contributor

bors commented Jul 5, 2019

⌛ Testing commit 9ba054d with merge c8b5e72...

bors added a commit that referenced this pull request Jul 5, 2019
@bors
Auto merge of #4232 - mikerite:dev-fmt-4, r=flip1995
c8b5e72 
Add dev fmt subcommand

changelog: none
@bors
Copy link
Contributor

bors commented Jul 5, 2019

💔 Test failed - status-appveyor

@phansch
Copy link
Member

phansch commented Jul 5, 2019

Looks like we'll have to replace ONCE_INIT in the UI tests?

@flip1995
Copy link
Member

flip1995 commented Jul 7, 2019

Removed the merge commits

@bors r+ p=10

@bors
Copy link
Contributor

bors commented Jul 7, 2019

📌 Commit c0c2a8d has been approved by flip1995

@bors
Copy link
Contributor

bors commented Jul 7, 2019

⌛ Testing commit c0c2a8d with merge 1f3cc0b...

bors added a commit that referenced this pull request Jul 7, 2019
@bors
Auto merge of #4232 - mikerite:dev-fmt-4, r=flip1995
1f3cc0b 
Add dev fmt subcommand

changelog: none
@bors
Copy link
Contributor

bors commented Jul 7, 2019

💔 Test failed - status-appveyor

@tesuji
Copy link
Contributor

tesuji commented Jul 7, 2019 •
edited
Loading

Need to add rustup component add rustfmt --toolchain nightly in appveyor.

(Or we could just run fmt test on linux only. Because rustfmt does not respect
rustc cfg attributes).

@flip1995
Copy link
Member

flip1995 commented Jul 9, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Jul 9, 2019

📌 Commit 186b5b2 has been approved by flip1995

@bors
Copy link
Contributor

bors commented Jul 9, 2019

⌛ Testing commit 186b5b2 with merge bc258b6...

bors added a commit that referenced this pull request Jul 9, 2019
@bors
Auto merge of #4232 - mikerite:dev-fmt-4, r=flip1995
bc258b6 
Add dev fmt subcommand

changelog: none
@bors
Copy link
Contributor

bors commented Jul 9, 2019

💔 Test failed - status-appveyor

@ghost
Copy link
Author

ghost commented Jul 10, 2019

This is a rustfmt bug.

PS C:\Projects\rust-clippy> rustfmt .\tests\ui\implicit_hasher.rs
error: couldn't read \\?\C:\Projects\rust-clippy\tests\ui\..\auxiliary\test_macro.rs: The filename, directory name, or volume label syntax is incorrect. (os error 123)
  --> \\?\C:\Projects\rust-clippy\tests\ui\implicit_hasher.rs:88:9
   |
88 | pub mod test_macro;
   |         ^^^^^^^^^^

It's either rust-lang/rustfmt#1873 or related to it. I'm going to add windows specific excludes for files like that.

@flip1995 flip1995 added S-waiting-on-author Status: This is awaiting some action from the author. (Use `@rustbot ready` to update this status) and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties labels Jul 11, 2019
@bors
Copy link
Contributor

bors commented Jul 12, 2019

⌛ Testing commit 186b5b2 with merge cb0bc38...

bors added a commit that referenced this pull request Jul 12, 2019
@bors
Auto merge of #4232 - mikerite:dev-fmt-4, r=flip1995
cb0bc38 
Add dev fmt subcommand

changelog: none
@bors
Copy link
Contributor

bors commented Jul 12, 2019

💔 Test failed - checks-travis

@flip1995
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jul 13, 2019

📌 Commit 76d66e6 has been approved by flip1995

@bors
Copy link
Contributor

bors commented Jul 13, 2019

⌛ Testing commit 76d66e6 with merge 3267e05...

bors added a commit that referenced this pull request Jul 13, 2019
@bors
Auto merge of #4232 - mikerite:dev-fmt-4, r=flip1995
3267e05 
Add dev fmt subcommand

changelog: none
@bors
Copy link
Contributor

bors commented Jul 13, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: flip1995
Pushing 3267e05 to master...

@bors bors merged commit 76d66e6 into rust-lang:master Jul 13, 2019
@ghost ghost deleted the dev-fmt-4 branch July 15, 2019 05:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
S-waiting-on-author Status: This is awaiting some action from the author. (Use `@rustbot ready` to update this status)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@flip1995 @bors @phansch @tesuji @yaahc