Skip to content

run rustfmt on librustc_metadata folder - #37350

Merged
bors merged 1 commit into
rust-lang:masterfrom
srinivasreddy:meta_2
Oct 28, 2016
Merged

run rustfmt on librustc_metadata folder#37350
bors merged 1 commit into
rust-lang:masterfrom
srinivasreddy:meta_2

Conversation

@srinivasreddy

@srinivasreddysrinivasreddy commented Oct 22, 2016

Copy link
Copy Markdown
Contributor

No description provided.

@rust-highfive

rust-highfive commented Oct 22, 2016

Copy link
Copy Markdown
Contributor

r? @nrc

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

eddyb
eddyb reviewed Oct 22, 2016
View reviewed changes
Comment threadsrc/librustc_metadata/encoder.rs Outdated

@eddybeddybOct 22, 2016

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.

@nrc@ubsan This is obnoxious. I specifically indent my closure calls this way to avoid right-ward drift.

@nrcnrcOct 25, 2016

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 is somewhere we can teach Rustfmt to be a bit smarter, but its not the end of the world IMO. More annoying to me is that the alignment of dots is misleading about the scope.

@eddybeddyb mentioned this pull request Oct 22, 2016
Merged
@bors

bors commented Oct 23, 2016

Copy link
Copy Markdown
Collaborator

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

@nrc

nrc commented Oct 25, 2016

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Oct 25, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit ca83d02 has been approved by nrc

@bors

bors commented Oct 25, 2016

Copy link
Copy Markdown
Collaborator

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

@srinivasreddy

srinivasreddy commented Oct 25, 2016

Copy link
Copy Markdown
ContributorAuthor

@nrcapprove pls

@nrc

nrc commented Oct 25, 2016

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Oct 25, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 892a05d has been approved by nrc

Manishearth added a commit to Manishearth/rust that referenced this pull request Oct 26, 2016
@Manishearth
Rollup merge ofrust-lang#37350- srinivasreddy:meta_2, r=nrc
5bc5647
run rustfmt on librustc_metadata folder
@ManishearthManishearth mentioned this pull request Oct 26, 2016
Closed
jseyfried
jseyfried reviewed Oct 27, 2016
View reviewed changes
Comment threadsrc/librustc_metadata/encoder.rs
type_shorthands: Default::default(),
predicate_shorthands: Default::default()
}.encode_crate_root();
opaque: opaque::Encoder::new(&mut cursor),

@jseyfriedjseyfriedOct 27, 2016

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.

Strange indent (rustfmt bug?)

@bors

bors commented Oct 27, 2016

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 892a05d with merge 3f44083...

bors added a commit that referenced this pull request Oct 27, 2016
@bors
Auto merge of#37350- srinivasreddy:meta_2, r=nrc
3f44083
run rustfmt on librustc_metadata folder
@bors

bors commented Oct 28, 2016

Copy link
Copy Markdown
Collaborator

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-cargotest, auto-linux-64-cross-freebsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-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, auto-win-msvc-64-opt-rustbuild
Approved by: nrc
Pushing 3f44083 to master...

@bors
bors merged commit 892a05d into rust-lang:masterOct 28, 2016
This was referenced Oct 28, 2016
Merged
Merged
@srinivasreddy
srinivasreddy deleted the meta_2 branch October 28, 2016 04:00
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

3 more reviewers
@eddybeddybeddyb left review comments
@nrcnrcnrc left review comments
@jseyfriedjseyfriedjseyfried left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@nrcnrc

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@srinivasreddy@rust-highfive@bors@nrc@eddyb@jseyfried