Uh oh!
There was an error while loading. Please reload this page.
Rollup of 6 pull requests - #41395
Closed
frewsxcv wants to merge 17 commits into
Closed
Conversation
frewsxcv
commented
Apr 19, 2017
Contributor
- Successful merges: Improve std::path docs #41348, Run tests for the cargo submodule in tree #41362, update mdbook #41374, Fix ICE building gluon_vm #41377, Fix a few stability attributes #41380, remove disclaimer from bootstrap/README.md #41391
- Failed merges:
Part of rust-lang#29368. * added missing links * updated method summaries to use 3rd person style * added missing periods in `Component`'s variant summaries * use standard iterator boilerplate in `Components`' and `Iter`'s docs * added example to `Iter::as_path`, adapted from `Components::as_path`'s example * consolidated examples for `Path::file_name` * some other small fixes
Part of rust-lang#29368. * Added a new summary paragraph about std::path's parsing facilities * Slightly exanded `Component`'s docs * removed the now redundant section on component types from the module docs * moved the section on path normalization during parsing to the docs on `Path::components` * Clarified difference between `Prefix` and `PrefixComponent` in their respecive summary sentences
Part of rust-lang#29368. * Added explanation for why the struct exists * Added link to where it is created * Added example
* Closed an unclosed paren * seperator -> separator * deperator -> separator
Previously the `cargotest` suite would run some arbitrary revision of Cargo's test suite, but now that we're bundling it in tree we should be running the Cargo submodule's test suite instead.
These show up in rustdoc so need to be correct.
cc rust-lang#32730 -- I left exactly one instance where I wasn't sure of the right behavior.
Improve std::path docs Fixesrust-lang#29368. This PR contains a pretty significant redistribution of some of the module docs to more appropriate places, as well as general expansion, clarification, and additional examples. For more details, see the commit descriptions. r? @steveklabnik
Run tests for the cargo submodule in tree Previously the `cargotest` suite would run some arbitrary revision of Cargo's test suite, but now that we're bundling it in tree we should be running the Cargo submodule's test suite instead.
update mdbook Ship some more improvements. r? @rust-lang/docs
Fix a few stability attributes These show up in rustdoc so need to be correct.
remove disclaimer from bootstrap/README.md
rust-highfive
commented
Apr 19, 2017
Contributor
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @sfackler (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
commented
Apr 19, 2017
ContributorAuthor
@bors r+ p=10 |
bors
commented
Apr 19, 2017
Collaborator
📌 Commit 6bdf84d has been approved by |
bors
commented
Apr 19, 2017
Collaborator
⌛ Testing commit 6bdf84d with merge 084a9da... |
bors
commented
Apr 19, 2017
Collaborator
💔 Test failed - status-travis |
aidanhs
commented
Apr 19, 2017
Contributor
Now that's interesting, we've seen this before (ctrl+f "corrupt download" on #40474) but on appveyor. Spurious though. |
frewsxcv
commented
Apr 19, 2017
ContributorAuthor
@bors retry |
bors
commented
Apr 19, 2017
Collaborator
⌛ Testing commit 6bdf84d with merge 8eeba27... |
bors
commented
Apr 19, 2017
Collaborator
💔 Test failed - status-travis |
aidanhs
commented
Apr 19, 2017
Contributor
Basically blocked on #41398. |
frewsxcv
commented
Apr 19, 2017
ContributorAuthor
I'll open a new rollup with that |
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
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
11 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.