Skip to content

Rollup of 11 pull requests #46166

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

Merged
merged 29 commits into from
Nov 21, 2017
Merged
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
ef275d1
update let-expressions to use except
gaurikholkar Nov 14, 2017
8cd5735
rustbuild: use a macro to define "extended" tools
Keruspe Nov 15, 2017
8f91a45
rustbuild: dist cargo-fmt as part of rustfmt
Keruspe Nov 15, 2017
9817589
rustbuild: make tidy happy
Keruspe Nov 16, 2017
6b1a3bc
Optimize `read_to_end`.
sunfishcode Nov 16, 2017
1a9dc2e
dead code lint to say "never constructed" for variants
zackmdavis Nov 19, 2017
78e269e
Include rendered diagnostic in json
oli-obk Nov 17, 2017
ddaf523
The end of a span can be *before* the first char in a line
oli-obk Nov 17, 2017
3864d89
Address PR comments
oli-obk Nov 20, 2017
b29a61e
rustbuild: fix expectation message
Keruspe Nov 20, 2017
e7b2702
Update ui test to rustc master
oli-obk Nov 20, 2017
09dcc5f
Display negative traits implementation
GuillaumeGomez Nov 20, 2017
0789a1d
Fix a typo in ToSocketAddrs documentation
aqrln Nov 20, 2017
b9a7601
Expand a couple points in 1.22.0 release notes
SimonSapin Nov 21, 2017
13c1cbe
Remove 1.23.0 release notes entry on const_fn
SimonSapin Nov 21, 2017
ad6f4dc
Revert servo to upstream in cargotest
SimonSapin Nov 21, 2017
e7c8fbf
clean the Debug impl for CrateNum and DefId
arielb1 Nov 20, 2017
ece9a57
fix some typos
martinlindhe Nov 21, 2017
c0c3cc4
Rollup merge of #45987 - gaurikholkar:let-expr, r=michaelwoerister
kennytm Nov 21, 2017
f8b3e7c
Rollup merge of #46031 - Keruspe:cargofmt, r=Mark-Simulacrum
kennytm Nov 21, 2017
9b090a0
Rollup merge of #46050 - sunfishcode:read_to_end, r=sfackler
kennytm Nov 21, 2017
0af67a4
Rollup merge of #46052 - oli-obk:rendered_diagnostics_in_json, r=petr…
kennytm Nov 21, 2017
7eb2e79
Rollup merge of #46103 - zackmdavis:dead_code_lint_should_say_never_c…
kennytm Nov 21, 2017
e77f3e4
Rollup merge of #46120 - arielb1:def-debug, r=michaelwoerister
kennytm Nov 21, 2017
3bf1328
Rollup merge of #46134 - GuillaumeGomez:negative-traits, r=QuietMisdr…
kennytm Nov 21, 2017
5b54193
Rollup merge of #46141 - aqrln:tosocketaddrs-doc-fix-typo, r=frewsxcv
kennytm Nov 21, 2017
9a69b00
Rollup merge of #46148 - SimonSapin:patch-6, r=alexcrichton
kennytm Nov 21, 2017
7f0a1e2
Rollup merge of #46155 - SimonSapin:stylo, r=kennytm
kennytm Nov 21, 2017
7c8b36f
Rollup merge of #46157 - martinlindhe:master, r=kennytm
kennytm Nov 21, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix a typo in ToSocketAddrs documentation
Fix a typo in ToSocketAddrs documentation: s/ToSocketsAddr/ToSocketAddrs
  • Loading branch information
aqrln committed Nov 20, 2017
commit 0789a1df65f313a0b01214eb64d973ba68d21700
2 changes: 1 addition & 1 deletion src/libstd/net/addr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,7 @@ impl hash::Hash for SocketAddrV6 {
/// ```
///
/// [`TcpStream::connect`] is an example of an function that utilizes
/// `ToSocketsAddr` as a trait bound on its parameter in order to accept
/// `ToSocketAddrs` as a trait bound on its parameter in order to accept
/// different types:
///
/// ```no_run
Expand Down