summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-01-24 03:06:25 +0000
committerbors <bors@rust-lang.org>2020-01-24 03:06:25 +0000
commit3f41b032eef8b749409b529225f22571075a8aeb (patch)
treeafa82f827a5487db94119ad55803774a032c84ab /src/libstd
parentfb30562162bf9e6f287499e08271d4f7ef91b018 (diff)
parentb0a99fdae9ee9f12865f7c07088acf4e3a4ad3dd (diff)
downloadrust-3f41b032eef8b749409b529225f22571075a8aeb.tar.gz
rust-3f41b032eef8b749409b529225f22571075a8aeb.zip
Auto merge of #68496 - Mark-Simulacrum:beta-next, r=Mark-Simulacrum
[beta] backports

This backports:
 * Do not ICE on malformed suggestion spans #68256
 * Distinguish between private items and hidden items in rustdoc #67875
 *  Revert parts of #66405. #67471

It also includes a few formatting commits to permit the backports to proceed cleanly (those are scoped to the relevant files, but still generate noise, of course). This was deemed easier than attempting to manually deal with the formatting.

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