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

run rustfmt on test/run-fail folder #33897

Merged
merged 1 commit into from
Jun 7, 2016
Merged

run rustfmt on test/run-fail folder #33897

merged 1 commit into from
Jun 7, 2016

Conversation

srinivasreddy
Copy link
Contributor

No description provided.

@rust-highfive
Copy link
Contributor

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

alexcrichton
alexcrichton reviewed May 27, 2016
View reviewed changes
src/test/run-fail/meta-revision-bad.rs
//[foo] error-pattern:bar
//[bar] error-pattern:foo
// [foo] error-pattern:bar
// [bar] error-pattern:foo
Copy link
Member

Choose a reason for hiding this comment

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

I think this may break these tests because compiletest currently searches for literally "//["

Copy link
Member

Choose a reason for hiding this comment

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

Probably best to manually fix this for now. I intend to change the default to not touch comments in the next release of rustfmt, so long term (well, medium term) it shouldn't be a problem

@alexcrichton
Copy link
Member

cc @nrc

@srinivasreddy
Copy link
Contributor Author

@alexcrichton @nrc manually fixed. Take a look.

@alexcrichton
Copy link
Member

@bors: retry

@alexcrichton
Copy link
Member

er, that was just muscle memory...

r? @nrc

@rust-highfive rust-highfive assigned nrc and unassigned alexcrichton Jun 6, 2016
@nrc
Copy link
Member

nrc commented Jun 7, 2016

@bors: r+

@bors
Copy link
Collaborator

bors commented Jun 7, 2016

📌 Commit 73ef372 has been approved by nrc

@eddyb
Copy link
Member

eddyb commented Jun 7, 2016

@bors rollup

steveklabnik added a commit to steveklabnik/rust that referenced this pull request Jun 7, 2016
@steveklabnik
Rollup merge of rust-lang#33897 - srinivasreddy:runfail_rustfmt, r=nrc
2b94d84 
run rustfmt on test/run-fail folder
@steveklabnik steveklabnik mentioned this pull request Jun 7, 2016
Merged
bors added a commit that referenced this pull request Jun 7, 2016
@bors
Auto merge of #34139 - steveklabnik:rollup, r=steveklabnik
39a523b 
Rollup of 13 pull requests

- Successful merges: #33645, #33897, #33945, #34007, #34060, #34070, #34094, #34098, #34099, #34104, #34124, #34125, #34138
- Failed merges:
@bors bors merged commit 73ef372 into rust-lang:master Jun 7, 2016
@srinivasreddy srinivasreddy deleted the runfail_rustfmt branch June 7, 2016 23:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nrc nrc

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@srinivasreddy @rust-highfive @alexcrichton @nrc @bors @eddyb