Rollup of 8 pull requests #42856
Merged
Rollup of 8 pull requests #42856
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Member
Mark-Simulacrum commented Jun 23, 2017
Mark-Simulacrum commented - Successful merges: Remove most "```ignore" doc tests. #42777, Redox: Use create() instead of open() when setting env variable #42783, add extended information for E0562; impl Trait can only be a return type #42787, Print -Zincremental-info to stderr instead of stdout. #42821, Ensure Guard types impl Display & Debug #42822, Fix ref as mutable ref in std::rc::Rc doc #42825, Set CXX_<target> in bootstrap #42829, change span label for E0435 #42833
- Failed merges:
Replaced by adding extra imports, adding hidden code (`# ...`), modifying examples to be runnable (sorry Homura), specifying non-Rust code, and converting to should_panic, no_run, or compile_fail. Remaining "```ignore"s received an explanation why they are being ignored.
…bank Remove most "```ignore" doc tests. Unconditional ` ```ignore ` doc tests lead to outdated examples (e.g. rust-lang#42729 (comment)). This PR tries to change all existing ` ```ignore ` tests into one of the following: * Add import and declarations to ensure the code is run-pass * If the code is not Rust, change to ` ```text `/` ```sh `/` ```json `/` ```dot ` * If the code is expected compile-fail, change to ` ```compile_fail ` * If the code is expected run-fail, change to ` ```should_panic ` * If the code can type-check but cannot link/run, change to ` ```no_run ` * Otherwise, add an explanation after the ` ```ignore ` The `--explain` handling is changed to cope with hidden lines from the error index. Tidy is changed to reject any unexplained ` ```ignore ` and ` ```rust,ignore `.
Redox: Use create() instead of open() when setting env variable See redox-os/kernel#25.
…meGomez add extended information for E0562; impl Trait can only be a return type r? @GuillaumeGomez
…on-stderr, r=alexcrichton Print -Zincremental-info to stderr instead of stdout. Fixes rust-lang#42583. The [cargo-incremental](https://github.com/nikomatsakis/cargo-incremental) tool probably does not need to be updated. It already merges stdout and stderr before parsing the compiler's output. r? @alexcrichton
…excrichton Ensure Guard types impl Display & Debug Fixes rust-lang#24372
Fix ref as mutable ref in std::rc::Rc doc
Set CXX_<target> in bootstrap I came across this trying to cross-compile rustc for Redox. It was also mentioned in a comment on rust-lang#42206, but doesn't seem to have been corrected.
…nt, r=Mark-Simulacrum change span label for E0435 r? @Mark-Simulacrum
| r? @eddyb (rust_highfive has picked a reviewer for you, use r? to override) |
| @bors r+ p=10 |
| 📌 Commit 9037ef2 has been approved by |
| ⌛ Testing commit 9037ef2 with merge 67dd868eb06e53323d5f2191567d1796ba7e5736... |
| 💔 Test failed - status-travis |
| @bors retry |
bors added a commit that referenced this pull request Jun 23, 2017
| ☀️ Test successful - status-appveyor, status-travis |
This was referenced Jun 23, 2017
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
12 participants
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.