about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-09-16 15:42:02 +0000
committerbors <bors@rust-lang.org>2018-09-16 15:42:02 +0000
commitd3cba9b4b4959d63eaaf5ffd647e4a5fc6d43e17 (patch)
tree40497aff8f7d707791844dd498118d20653e0779 /src/libstd
parent32dc5a0783560c97f3c42dafad25dcee9cf6d723 (diff)
parent8b1e5e1f01d0250b7bfd843b2035c3fbf7fbafd5 (diff)
downloadrust-d3cba9b4b4959d63eaaf5ffd647e4a5fc6d43e17.tar.gz
rust-d3cba9b4b4959d63eaaf5ffd647e4a5fc6d43e17.zip
Auto merge of #54270 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 5 pull requests

Successful merges:

 - #53941 (rustdoc: Sort implementors)
 - #54181 (Suggest && and || instead of 'and' and 'or')
 - #54209 (Partially revert 674a5db "Fix undesirable fallout [from macro modularization]")
 - #54213 (De-overlap the lifetimes of `flow_inits` and `flow_{un,ever_}inits`.)
 - #54244 (Add a small search box to seach Rust's standary library)

Failed merges:

r? @ghost
Diffstat (limited to 'src/libstd')
0 files changed, 0 insertions, 0 deletions