Skip to content

Commit 37d001e

Browse files
committed
Auto merge of #61317 - oli-obk:rollup-tm5qivq, r=oli-obk
Rollup of 7 pull requests Successful merges: - #60549 (do not print panic message on doctest failures) - #60885 (strip synstructure consts from compiler docs) - #61217 (Account for short-hand init structs when suggesting conversion) - #61261 (is_union returns ty to avoid computing it twice) - #61293 (Print const generics properly in rustdoc) - #61310 (split libcore::mem into multiple files) - #61313 (Simplify Set1::insert) Failed merges: r? @ghost
2 parents 8197085 + b742d7e commit 37d001e

28 files changed

+1761
-1507
lines changed

Cargo.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -860,7 +860,7 @@ dependencies = [
860860
"proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
861861
"quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
862862
"syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)",
863-
"synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
863+
"synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
864864
]
865865

866866
[[package]]
@@ -2875,7 +2875,7 @@ dependencies = [
28752875
"proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
28762876
"quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
28772877
"syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)",
2878-
"synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
2878+
"synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
28792879
]
28802880

28812881
[[package]]
@@ -3428,7 +3428,7 @@ dependencies = [
34283428

34293429
[[package]]
34303430
name = "synstructure"
3431-
version = "0.10.1"
3431+
version = "0.10.2"
34323432
source = "registry+https://github.com/rust-lang/crates.io-index"
34333433
dependencies = [
34343434
"proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4367,7 +4367,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
43674367
"checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
43684368
"checksum syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)" = "ae8b29eb5210bc5cf63ed6149cbf9adfc82ac0be023d8735c176ee74a2db4da7"
43694369
"checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
4370-
"checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015"
4370+
"checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f"
43714371
"checksum tar 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)" = "a303ba60a099fcd2aaa646b14d2724591a96a75283e4b7ed3d1a1658909d9ae2"
43724372
"checksum tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "7e91405c14320e5c79b3d148e1c86f40749a36e490642202a31689cb1a3452b2"
43734373
"checksum tendril 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9de21546595a0873061940d994bbbc5c35f024ae4fd61ec5c5b159115684f508"

src/bootstrap/doc.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -728,7 +728,7 @@ impl Step for Rustc {
728728

729729
// Build cargo command.
730730
let mut cargo = builder.cargo(compiler, Mode::Rustc, target, "doc");
731-
cargo.env("RUSTDOCFLAGS", "--document-private-items");
731+
cargo.env("RUSTDOCFLAGS", "--document-private-items --passes strip-hidden");
732732
compile::rustc_cargo(builder, &mut cargo);
733733

734734
// Only include compiler crates, no dependencies of those, such as `libc`.

0 commit comments

Comments
 (0)