Skip to content

Run rustfmt on librustc_mir/hair/cx#37052

Merged
bors merged 1 commit into
rust-lang:masterfrom
srinivasreddy:hair_cx
Dec 13, 2016
Merged

Run rustfmt on librustc_mir/hair/cx#37052
bors merged 1 commit into
rust-lang:masterfrom
srinivasreddy:hair_cx

Conversation

@srinivasreddy

@srinivasreddy srinivasreddy commented Oct 9, 2016

Copy link
Copy Markdown
Contributor

No description provided.

@rust-highfive

rust-highfive commented Oct 9, 2016

Copy link
Copy Markdown
Contributor

r? @pnkfelix

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

@srinivasreddy

srinivasreddy commented Oct 12, 2016

Copy link
Copy Markdown
Contributor Author

r? @nrc

@rust-highfive rust-highfive assigned nrc and unassigned pnkfelix Oct 12, 2016
@nrc

nrc commented Oct 17, 2016

Copy link
Copy Markdown
Member

r? @pnkfelix (distributing these among the compiler team a bit)

@rust-highfive rust-highfive assigned pnkfelix and unassigned nrc Oct 17, 2016
@bors

bors commented Oct 27, 2016

Copy link
Copy Markdown
Collaborator

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

@bors

bors commented Nov 6, 2016

Copy link
Copy Markdown
Collaborator

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

@brson

brson commented Nov 11, 2016

Copy link
Copy Markdown
Contributor

This PR seems to add an entire file, pattern.rs. I imagine this is an accident since it is just running rustfmt. Can you remove that file from the PR and rebase?

Sorry for the delay in review.

@eddyb

eddyb commented Nov 13, 2016

Copy link
Copy Markdown
Contributor

@brson Presumably rather than rebasing it'd be better to just reset to master and run rustfmt again.

@srinivasreddy

srinivasreddy commented Nov 13, 2016

Copy link
Copy Markdown
Contributor Author

I will be on vacation until Dec 1st. Will do it afterwards only.

@mrhota

mrhota commented Dec 5, 2016

Copy link
Copy Markdown
Contributor

@srinivasreddy ping?

@srinivasreddy

srinivasreddy commented Dec 5, 2016

Copy link
Copy Markdown
Contributor Author

@mrhota Will do it today. Thanks for the ping.

@pnkfelix

pnkfelix commented Dec 6, 2016

Copy link
Copy Markdown
Contributor

@srinivasreddy I still see a pattern.rs file in the diff; didn't @brson ask you to remove that file from the PR?

@srinivasreddy

srinivasreddy commented Dec 7, 2016

Copy link
Copy Markdown
Contributor Author

@pnkfelix Done. sorry, i missed that.

@pnkfelix

pnkfelix commented Dec 8, 2016

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented Dec 8, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit f78aa4d has been approved by pnkfelix

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Dec 12, 2016
@frewsxcv
Rollup merge of rust-lang#37052 - srinivasreddy:hair_cx, r=pnkfelix
0bc2234 
Run rustfmt on librustc_mir/hair/cx
@frewsxcv frewsxcv mentioned this pull request Dec 12, 2016
Closed
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Dec 12, 2016
@frewsxcv
Rollup merge of rust-lang#37052 - srinivasreddy:hair_cx, r=pnkfelix
dc1a094 
Run rustfmt on librustc_mir/hair/cx
@frewsxcv frewsxcv mentioned this pull request Dec 12, 2016
Merged
bors added a commit that referenced this pull request Dec 13, 2016
@bors
Auto merge of #38325 - frewsxcv:rollup, r=frewsxcv
5a2b50b 
Rollup of 7 pull requests

- Successful merges: #37052, #37941, #38067, #38164, #38202, #38264, #38299
- Failed merges:
@bors bors merged commit f78aa4d into rust-lang:master Dec 13, 2016
@srinivasreddy srinivasreddy deleted the hair_cx branch December 13, 2016 13:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@pnkfelix pnkfelix

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@srinivasreddy @rust-highfive @nrc @bors @brson @eddyb @mrhota @pnkfelix