Rollup of 7 pull requests #33204
Merged
Rollup of 7 pull requests #33204
+301
−89
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
Manishearth
commented
Apr 25, 2016
Manishearth
commented
- Successful merges: Show previous definition of duplicate impl item #33107, rustdoc: inline all the impls #33133, show unstable status for deprecated items #33160, clarify documentation of TcpStream::connect() for multiple valid addresses #33167, rustdoc: Improve accessibility of rustdoc pages #33194, rustdoc: Linkify extern crates #33196, Fix reference to TCP in UDP docs #33200
- Failed merges:
…esses Signed-off-by: benaryorg <[email protected]>
This used to be done to avoid inlining impls referencing private items, but is now unnecessary since we actually check that impls do not reference non-doc-reachable items.
An item is inlined and recorded as inlined even if it is `doc(hidden)`, leading to unchecked external links.
Show previous definition of duplicate impl item Fix rust-lang#32971.
…ichton rustdoc: inline all the impls This used to be done to avoid inlining impls referencing private items, but is now unnecessary since we actually check that impls do not reference non-doc-reachable items. fixes rust-lang#32881 fixes rust-lang#33025 fixes rust-lang#33113 r? @alexcrichton
… r=alexcrichton show unstable status for deprecated items Fixes rust-lang#32374.
clarify documentation of TcpStream::connect() for multiple valid addresses I am not sure how the UDP part of the stdlib behaves when passing multiple valid addresses, but it should be mentioned as there are legit use cases for [`impl<'a> ToSocketAddrs for &'a [SocketAddr]`](http://doc.rust-lang.org/nightly/std/net/trait.ToSocketAddrs.html), a TCP fallback only being one. Just a little example program for anyone willing to enhance the documentation further: ```rust use std::net::SocketAddr; use std::net::ToSocketAddrs; use std::net::TcpStream; fn main() { let v: Vec<SocketAddr> = vec! [ "127.0.0.1:1338".to_socket_addrs().unwrap().next().unwrap(), "127.0.0.1:1337".to_socket_addrs().unwrap().next().unwrap(), "127.0.0.1:1339".to_socket_addrs().unwrap().next().unwrap(), ]; let stream = TcpStream::connect(&v[..]).unwrap(); } ```
rustdoc: Improve accessibility of rustdoc pages fixes rust-lang#33131 r? @alexcrichton
rustdoc: Linkify extern crates fixes rust-lang#33178 r? @alexcrichton
…ichton Fix reference to TCP in UDP docs Closees rust-lang#33195
|
@bors r+ p=10 |
|
📌 Commit 3dc0b55 has been approved by |
bors
added a commit
that referenced
this pull request
Apr 25, 2016
|
💔 Test failed - auto-win-msvc-32-opt |
|
@bors: retry On Mon, Apr 25, 2016 at 3:25 PM, bors [email protected] wrote:
|
|
@bors force |
|
💔 Test failed - auto-linux-64-x-android-t |
|
@bors retry force looks like gdb went boom? |
|
@bors retry force |
|
💔 Test failed - auto-linux-64-x-android-t |
|
@bors retry p=9 |
bors
added a commit
that referenced
this pull request
Apr 26, 2016
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.