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.

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

Added error-format flag to x.py. #48517

Merged
merged 1 commit into from Feb 25, 2018
Merged

Added error-format flag to x.py. #48517

merged 1 commit into from Feb 25, 2018

Conversation

ghost
Copy link

@ghost ghost commented Feb 24, 2018

@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 @Mark-Simulacrum (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.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 24, 2018
@Mark-Simulacrum
Copy link
Member

This looks good, thank you!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Feb 24, 2018

📌 Commit 264a921 has been approved by Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Feb 24, 2018

🌲 The tree is currently closed for pull requests below priority 100, this pull request will be tested once the tree is reopened

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 24, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Feb 25, 2018
bors added a commit that referenced this pull request Feb 25, 2018
Rollup of 17 pull requests

- Successful merges: #47964, #47970, #48076, #48115, #48166, #48281, #48297, #48302, #48362, #48369, #48489, #48491, #48494, #48517, #48529, #48235, #48330
- Failed merges:
@bors bors merged commit 264a921 into rust-lang:master Feb 25, 2018
@Manishearth
Copy link
Member

This isn't enough, actually. The reason RUSTFLAGS doesn't just work here is because we ask cargo for --message-format=json (and then strip out the flag it passes down to rustc).

Then we strip out json from the output and read it, only passing through stuff that isn't json.

We'll need to make that pass smarter, where it detects which JSON messages come from cargo and only strips those out.

@Mark-Simulacrum
Copy link
Member

Hm, yeah. Ideally we'd tell rustc somehow that it's messages should go to a different file descriptor (which might be possible as we wrap rustc anyway...). Easiest thing to do for now though is probably to print out the line we received here: https://github.com/penpalperson/rust/blob/264a92182e037c46cdcf37890e3142eaf634444d/src/bootstrap/compile.rs#L1011, since that should be enough to catch all cargo-related messages. @penpalperson Are you interested in making that change?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants