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

Rollup of 10 pull requests #47622

Merged
merged 23 commits into from
Jan 21, 2018
Merged

Rollup of 10 pull requests #47622

merged 23 commits into from
Jan 21, 2018

Conversation

hellow554 and others added 23 commits December 22, 2017 06:42
These impls are useful when working with combinator
methods that expect an option or a result, but you
have a Result<Option<T>, E> instead of an Option<Result<T, E>>
or vice versa.
removed styling of dt tages, which would make them look like keys and
added <kbd> tag inside of dt tag.
Added css style for kbd and removed some stylings for dt
Affected methods are `starts_with` and `strip_prefix`.
We intended to do this quite a while ago but it snuck through.
Though some parts of rust use cc-rs to invoke a compiler/linker, Cargo
seems to make use of the TargetOptions::linker property. Make the out of
the box experience for CloudABI a bit better by using the same compiler
name as cc-rs.
Focus on the ordering/range benefit.
 - use consistent phrasing for expected and found arguments
 - suggest changing arugments to tuple if possible
 - suggest changing single tuple argument to arguments if possible
…laumeGomez

add kbd style tag to main.css in rustdoc

Added css style for kbd tags so they actually look like keys.
Result preview and discussion was going on in rust-lang#46900 .
Add transpose conversions for nested Option and Result

These impls are useful when working with combinator
methods that expect an option or a result, but you
have a `Result<Option<T>, E>` instead of an `Option<Result<T, E>>`
or vice versa.
…eveklabnik

add Rust By Example to the bookshelf

cc rust-lang#46194

With rust-lang#46196 freshly merged, we should add a link to the main docs distribution so people can find it! We discussed this at the docs team meeting today and decided to go ahead with adding it to the bookshelf.
Deprecate std::net::lookup_host

We intended to do this quite a while ago but it snuck through.

r? @alexcrichton
Add some edge cases to the documentation of `Path`

Affected methods are `starts_with` and `strip_prefix`.
add target/ to ignored tidy dirs

Sometimes you get a target directory from running cargo in the rust repo (the root is `src/`), and it contains generated files. Just whitelist it since it causes tidy to spew warnings uncontrollably.
Fix the "Github - About Pull Requests" link in CONTRIBUTING.md

Previously the text that is supposed to link to the Github Pull Requests page, instead linked to the same file (CONTRIBUTING.md).
…richton

Give TargetOptions::linker a sane default value for CloudABI.

Though some parts of rust use cc-rs to invoke a compiler/linker, Cargo
seems to make use of the TargetOptions::linker property. Make the out of
the box experience for CloudABI a bit better by using the same compiler
name as cc-rs.
Closure argument mismatch tweaks

 - use consistent phrasing for expected and found arguments
 - suggest changing arguments to tuple if possible
 - suggest changing single tuple argument to arguments if possible

Fix rust-lang#44150.
Update BTreeMap recommendation

Focus on the ordering / range(instead of all) benefit as it's the most important feature.
@rust-highfive
Copy link
Collaborator

Some changes occurred in HTML/CSS.

cc @GuillaumeGomez

@rust-highfive
Copy link
Collaborator

r? @cramertj

(rust_highfive has picked a reviewer for you, use r? to override)

@GuillaumeGomez
Copy link
Member Author

@bors: r+ p=1

@bors
Copy link
Contributor

bors commented Jan 20, 2018

📌 Commit 4074893 has been approved by GuillaumeGomez

@bors
Copy link
Contributor

bors commented Jan 20, 2018

⌛ Testing commit 4074893 with merge 0af40b6d4ae09033e76cd07439cfff2dd5469ed2...

@bors
Copy link
Contributor

bors commented Jan 21, 2018

💔 Test failed - status-appveyor

@aidanhs
Copy link
Member

aidanhs commented Jan 21, 2018

@bors retry

appveyor timeout

@bors
Copy link
Contributor

bors commented Jan 21, 2018

⌛ Testing commit 4074893 with merge 8d3e93b...

bors added a commit that referenced this pull request Jan 21, 2018
Rollup of 10 pull requests

- Successful merges: #46938, #47193, #47508, #47510, #47532, #47535, #47559, #47568, #47573, #47578
- Failed merges:
@bors
Copy link
Contributor

bors commented Jan 21, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: GuillaumeGomez
Pushing 8d3e93b to master...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.