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 librustc_passes folder #33951

Merged
merged 1 commit into from
Aug 6, 2016
Merged

run rustfmt on librustc_passes folder #33951

merged 1 commit into from
Aug 6, 2016

Conversation

srinivasreddy
Copy link
Contributor

No description provided.

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

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

nagisa
nagisa reviewed May 29, 2016
View reviewed changes
src/librustc_passes/consts.rs
self.tcx.sess.add_lint(CONST_ERR,
expr.id,
expr.span,
format!("constant evaluation error: {}. This will \
become a HARD ERROR in the future",
Copy link
Member

Choose a reason for hiding this comment

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

Becomes weirdly misaligned.

Copy link
Contributor

Choose a reason for hiding this comment

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

I didn't find an existing rustfmt issue, so I filed rust-lang/rustfmt#1026 -- @nagisa, is that what you meant?

@nikomatsakis
Copy link
Contributor

I'd be happy to r+ but for this tidy failure:

https://travis-ci.org/rust-lang/rust/builds/133743527#L1234

seems like a bug in rustfmt?

@srinivasreddy
Copy link
Contributor Author

@nikomatsakis I roll up please. I removed that line manually.

@nikomatsakis
Copy link
Contributor

@srinivasreddy did you file some sort of bug in rustfmt repo?

@srinivasreddy
Copy link
Contributor Author

nope.AFAIK, Not required. rustfmt does not panic when it crosses 100 chars limit in a line and goes on formatting, And it just gives you sorry message on console. I guess it is an expected behaviour. Let's confirm with what @nrc says.

@nikomatsakis
Copy link
Contributor

@srinivasreddy seems like this bug rust-lang/rustfmt#1080 fits the bill, sort of.

@nikomatsakis
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jun 27, 2016

📌 Commit faa039f has been approved by nikomatsakis

steveklabnik added a commit to steveklabnik/rust that referenced this pull request Jun 27, 2016
@steveklabnik
Rollup merge of rust-lang#33951 - srinivasreddy:librust_pass_rustfmt,…
9f6e900 
… r=nikomatsakis

run rustfmt on librustc_passes folder
@steveklabnik steveklabnik mentioned this pull request Jun 27, 2016
Closed
@bors
Copy link
Contributor

bors commented Jun 28, 2016

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

@GuillaumeGomez GuillaumeGomez mentioned this pull request Jun 28, 2016
Merged
bors added a commit that referenced this pull request Jun 28, 2016
@bors
Auto merge of #34525 - GuillaumeGomez:rollup, r=GuillaumeGomez
59152a4 
Rollup of 13 pull requests

- Successful merges: #34080, #34287, #34328, #34406, #34415, #34442, #34462, #34471, #34475, #34479, #34517, #34518, #34524
- Failed merges: #33951
@bors
Copy link
Contributor

bors commented Jul 1, 2016

🔒 Merge conflict

This was referenced Jul 5, 2016
Closed
Closed
@steveklabnik steveklabnik mentioned this pull request Jul 6, 2016
Merged
bors added a commit that referenced this pull request Jul 7, 2016
@bors
Auto merge of #34695 - steveklabnik:rollup, r=steveklabnik
5c674a1 
Rollup of 15 pull requests

- Successful merges: #33250, #33265, #34277, #34327, #34521, #34558, #34615, #34619, #34621, #34625, #34626, #34636, #34664, #34667, #34685
- Failed merges: #33951
@GuillaumeGomez GuillaumeGomez mentioned this pull request Jul 12, 2016
Merged
bors added a commit that referenced this pull request Jul 12, 2016
@bors
Auto merge of #34778 - GuillaumeGomez:rollup, r=GuillaumeGomez
31e9ed5 
Rollup of 7 pull requests

- Successful merges: #34736, #34737, #34740, #34742, #34749, #34750, #34770
- Failed merges: #33951
@GuillaumeGomez GuillaumeGomez mentioned this pull request Jul 14, 2016
Merged
bors added a commit that referenced this pull request Jul 15, 2016
@bors
Auto merge of #34819 - GuillaumeGomez:rollup, r=GuillaumeGomez
3cc3ad1 
Rollup of 7 pull requests

- Successful merges: #34456, #34733, #34777, #34794, #34799, #34804, #34818
- Failed merges: #33951
@GuillaumeGomez GuillaumeGomez mentioned this pull request Jul 16, 2016
Merged
jseyfried
jseyfried reviewed Jul 22, 2016
View reviewed changes
src/librustc_passes/ast_validation.rs
are not allowed, use unit structs and \
enum variants instead")
.span_help(span, "remove trailing `()` to make a unit \
.span_help(span,
"remove trailing `()` to make a unit \
struct or unit enum variant")
Copy link
Contributor

Choose a reason for hiding this comment

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

Strange indent.

Copy link
Member

Choose a reason for hiding this comment

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

All of these are due to the same reason and all should be fixed up manually.

@bors
Copy link
Contributor

bors commented Jul 28, 2016

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

@nikomatsakis
Copy link
Contributor

Just in general my feeling is that if there is "suboptimal" formatting we should certainly make issues about it and discuss it as rustfmt guidelines get hammered out, but in general we want to adopt automated formatting just because it everyone's life easier -- even if there are some corner cases where hand-formatting might improve things. (Most of the examples raised here I personally could go either way, I admit.)

@nikomatsakis
Copy link
Contributor

@srinivasreddy want to rebase this?

@srinivasreddy
Copy link
Contributor Author

@nikomatsakis Done.

@bors
Copy link
Contributor

bors commented Aug 4, 2016

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

@srinivasreddy
Copy link
Contributor Author

@nikomatsakis Done.

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Aug 5, 2016

📌 Commit a6c9404 has been approved by nikomatsakis

@eddyb eddyb mentioned this pull request Aug 6, 2016
Merged
@bors
Copy link
Contributor

bors commented Aug 6, 2016

⌛ Testing commit a6c9404 with merge 1fd8b88...

bors added a commit that referenced this pull request Aug 6, 2016
@bors
Auto merge of #33951 - srinivasreddy:librust_pass_rustfmt, r=nikomats…
1fd8b88 
…akis

run rustfmt on librustc_passes folder
eddyb added a commit to eddyb/rust that referenced this pull request Aug 6, 2016
@eddyb
Rollup merge of rust-lang#33951 - srinivasreddy:librust_pass_rustfmt,…
8e04264 
… r=nikomatsakis

run rustfmt on librustc_passes folder
@bors
Copy link
Contributor

bors commented Aug 6, 2016

⛄ The build was interrupted to prioritize another pull request.

bors added a commit that referenced this pull request Aug 6, 2016
@bors
Auto merge of #35407 - eddyb:rollup, r=eddyb
444ff9f 
Rollup of 21 pull requests

- Successful merges: #33951, #34916, #35287, #35288, #35351, #35353, #35356, #35362, #35363, #35364, #35366, #35368, #35370, #35372, #35373, #35374, #35375, #35376, #35380, #35393, #35394
- Failed merges: #35331, #35395
@bors
Copy link
Contributor

bors commented Aug 6, 2016

⚡ Previous build results for auto-linux-32-nopt-t, auto-linux-64-cargotest, auto-linux-64-cross-freebsd, auto-linux-64-opt, auto-linux-64-opt-no-mir, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt-no-mir, auto-win-msvc-64-opt-rustbuild are reusable. Rebuilding only auto-linux-32-opt, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-mac-32-opt, auto-win-gnu-32-opt, auto-win-msvc-64-opt...

@bors
Copy link
Contributor

bors commented Aug 6, 2016

⛄ The build was interrupted to prioritize another pull request.

@bors bors merged commit a6c9404 into rust-lang:master Aug 6, 2016
@srinivasreddy srinivasreddy deleted the librust_pass_rustfmt branch August 7, 2016 04:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nikomatsakis nikomatsakis

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@srinivasreddy @rust-highfive @nikomatsakis @bors @nagisa @nrc @jseyfried