Rollup of 8 pull requests #42165
Merged
Rollup of 8 pull requests #42165
Conversation
This file contains 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
frewsxcv
commented
May 23, 2017
frewsxcv
commented
- Successful merges: Stabilize the loop_break_value feature #42016, Add a few entries to the Unstable Book. #42122, make ui test output patch compatible #41948 #42144, rustdoc: Fix names of items in cross crate reexported modules #42145, Mention Vec::into_boxed_slice in documentation of [T]::into_vec #42151, Add missing links for CStr and CString #42152, regression test for #38821 #42160, Adding links to option::Option #42163
- Failed merges:
For renamed reexports the new name should be used.
`Vec::into_boxed_slice` and `[T]::into_vec` are inverses, so it makes sense to mention the other in their respective documentation for visibility. `Vec::into_boxed_slice` already mentions `[T]::into_vec`, but not the other way around until now.
The documentation for this method appears on multiple different pages, which causes the relative links to not always work.
…alue, r=nikomatsakis Stabilize the loop_break_value feature Tracking issue: rust-lang#37339. Documentation PRs already sent to the various repositories.
…=steveklabnik Add a few entries to the Unstable Book.
make ui test output patch compatible rust-lang#41948 Hello! Previously with rust-lang#41474 I've changed the internals of UI test output comparison mechanism. That change didn't change the diff format that we were producing but we needed to improve it anyway. This makes unified diff lines a little bit more `patch` compatible. Also I tried to introduce a unit test to check this but couldn't decide which of the following to implement: 1. Should I replace `println` macros with `Writer`s? And access the produced output within a test? 2. Should I add an external test (something like `src/test/run-pass/command-exec.rs`) 3. There are crates that capture `stdout`. Are they safe to use here? (I don't think so) Thanks! cc @nikomatsakis
…teveklabnik rustdoc: Fix names of items in cross crate reexported modules For renamed reexports the new name should be used. An example of this (as pointed out in rust-lang#27741 (comment)) is two instances of `StepBy` in [`std::iter`](https://doc.rust-lang.org/nightly/std/iter/index.html#structs). [`core::iter`](https://doc.rust-lang.org/nightly/core/iter/index.html#structs) is correct. Fixes rust-lang#37608
Mention Vec::into_boxed_slice in documentation of [T]::into_vec This is a documentation fix. `Vec::into_boxed_slice` and `[T]::into_vec` are inverses, so it makes sense to mention the other in their respective documentation for visibility. `Vec::into_boxed_slice` already mentions `[T]::into_vec`, but not the other way around until now. Tagging @steveklabnik per his request.
Add missing links for CStr and CString r? @rust-lang/docs
…ulacrum regression test for rust-lang#38821 Closes rust-lang#38821 r? @Mark-Simulacrum
Adding links to option::Option Just adding some links.
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @alexcrichton (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. |
|
@bors r+ p=10 |
|
📌 Commit aa7762f has been approved by |
bors
added a commit
that referenced
this pull request
May 23, 2017
|
☀️ Test successful - status-appveyor, status-travis |
This was referenced May 23, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.