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

Rollup of 2 pull requests #41321

Merged
merged 4 commits into from
Apr 15, 2017
Merged

Rollup of 2 pull requests #41321

merged 4 commits into from
Apr 15, 2017

Conversation

frewsxcv
Copy link
Member

naterhat and others added 4 commits April 14, 2017 15:33
@naterhat
add 'mir' as part of the --emit flag list in rustc --help menu and ma…
63ed784 
…n doc.

This is added because 'rustc' can now generate MIR (referencing to
"Teach rustc --emit=mir rust-lang#39891").
@tedsta
Update magenta error codes
1d05a02
@frewsxcv
Rollup merge of rust-lang#41306 - nateozem:support/docs-mir, r=frewsxcv
e9bc2b2 
add 'mir' to rustc help menu and man doc

add 'mir' to '--emit' flag list for 'rustc'.
This is added because 'rustc' can now generate MIR (referencing to
"Teach rustc --emit=mir rust-lang#39891").
@frewsxcv
Rollup merge of rust-lang#41311 - tedsta:fuchsia_error_codes, r=eddyb
591f62e 
Update magenta error codes

Update magenta error codes to match recent changes here: https://github.com/fuchsia-mirror/magenta/blob/master/system/public/magenta/errors.h
@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @brson (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@frewsxcv
Copy link
Member Author

@bors r+ p=10

@bors
Copy link
Contributor

bors commented Apr 15, 2017

📌 Commit 591f62e has been approved by frewsxcv

@bors
Copy link
Contributor

bors commented Apr 15, 2017

⌛ Testing commit 591f62e with merge ae23e65...

bors added a commit that referenced this pull request Apr 15, 2017
@bors
Auto merge of #41321 - frewsxcv:rollup, r=frewsxcv
ae23e65 
Rollup of 2 pull requests

- Successful merges: #41306, #41311
- Failed merges:
@bors
Copy link
Contributor

bors commented Apr 15, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: frewsxcv
Pushing ae23e65 to master...

@bors bors merged commit 591f62e into rust-lang:master Apr 15, 2017
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
rollup A PR which is a rollup
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@frewsxcv @rust-highfive @bors @brson @Centril @naterhat @tedsta