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_mir/hair/cx #37052

Merged
merged 1 commit into from
Dec 13, 2016
Merged

Run rustfmt on librustc_mir/hair/cx #37052

merged 1 commit into from
Dec 13, 2016

Conversation

srinivasreddy
Copy link
Contributor

No description provided.

@rust-highfive
Copy link
Collaborator

r? @pnkfelix

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

@srinivasreddy
Copy link
Contributor Author

r? @nrc

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

nrc commented Oct 17, 2016

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

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

bors commented Oct 27, 2016

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

@bors
Copy link
Contributor

bors commented Nov 6, 2016

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

@brson
Copy link
Contributor

brson commented Nov 11, 2016

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

eddyb commented Nov 13, 2016

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

@srinivasreddy
Copy link
Contributor Author

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

@mrhota
Copy link
Contributor

mrhota commented Dec 5, 2016

@srinivasreddy ping?

@srinivasreddy
Copy link
Contributor Author

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

@pnkfelix
Copy link
Member

pnkfelix commented Dec 6, 2016

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

@srinivasreddy
Copy link
Contributor Author

@pnkfelix Done. sorry, i missed that.

@pnkfelix
Copy link
Member

pnkfelix commented Dec 8, 2016

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Dec 8, 2016

📌 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