Skip to content

run rustfmt on test/run-fail folder#33897

Merged
bors merged 1 commit into
rust-lang:masterfrom
srinivasreddy:runfail_rustfmt
Jun 7, 2016
Merged

run rustfmt on test/run-fail folder#33897
bors merged 1 commit into
rust-lang:masterfrom
srinivasreddy:runfail_rustfmt

Conversation

@srinivasreddy

Copy link
Copy Markdown
Contributor

No description provided.

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @alexcrichton

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

Comment thread src/test/run-fail/meta-revision-bad.rs Outdated

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.

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

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.

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

cc @nrc

@srinivasreddy

Copy link
Copy Markdown
Contributor Author

@alexcrichton @nrc manually fixed. Take a look.

@alexcrichton

Copy link
Copy Markdown
Member

@bors: retry

@alexcrichton

Copy link
Copy Markdown
Member

er, that was just muscle memory...

r? @nrc

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

nrc commented Jun 7, 2016

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Jun 7, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 73ef372 has been approved by nrc

@eddyb

eddyb commented Jun 7, 2016

Copy link
Copy Markdown
Contributor

@bors rollup

steveklabnik added a commit to steveklabnik/rust that referenced this pull request Jun 7, 2016
bors added a commit that referenced this pull request Jun 7, 2016
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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants