Skip to content

Commit d173180

Browse files
committed
Auto merge of #58266 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 11 pull requests Successful merges: - #57504 (Re-enable history api on file:// protocol) - #57848 (Generate a documentation page for core::mem::transmute.) - #57884 (Update minifier version) - #57954 (rustdoc: remove blank unstable spans) - #58028 (Fix image link in the settings menu) - #58033 (rustdoc: wrap stability tags in colored spans) - #58086 ([rustdoc] Improve file list display) - #58143 (Sort elements in the sidebar) - #58146 (Prevent automatic collapse of methods impl blocks) - #58150 (Don't apply impl block collapse rules to trait impls) - #58185 (Remove images' url to make it work even without internet connection) Failed merges: r? @ghost
2 parents ad43389 + 761caa2 commit d173180

File tree

51 files changed

+240
-244
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+240
-244
lines changed

Cargo.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1503,7 +1503,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
15031503

15041504
[[package]]
15051505
name = "minifier"
1506-
version = "0.0.26"
1506+
version = "0.0.28"
15071507
source = "registry+https://github.com/rust-lang/crates.io-index"
15081508
dependencies = [
15091509
"macro-utils 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2992,7 +2992,7 @@ dependencies = [
29922992
name = "rustdoc"
29932993
version = "0.0.0"
29942994
dependencies = [
2995-
"minifier 0.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
2995+
"minifier 0.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
29962996
"parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
29972997
"pulldown-cmark 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
29982998
"tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4066,7 +4066,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
40664066
"checksum memchr 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0a3eb002f0535929f1199681417029ebea04aadc0c7a4224b46be99c7f5d6a16"
40674067
"checksum memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e2ffa2c986de11a9df78620c01eeaaf27d94d3ff02bf81bfcca953102dd0c6ff"
40684068
"checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3"
4069-
"checksum minifier 0.0.26 (registry+https://github.com/rust-lang/crates.io-index)" = "f299df45afd73332044ea9f717c816a84fc90c8b631409abf339ba93642a7985"
4069+
"checksum minifier 0.0.28 (registry+https://github.com/rust-lang/crates.io-index)" = "3a2898502751dcc9d66b6fff57f3cf63cc91605e83e1a33515396f5027f8e4ca"
40704070
"checksum miniz-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "0300eafb20369952951699b68243ab4334f4b10a88f411c221d444b36c40e649"
40714071
"checksum miniz_oxide 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5ad30a47319c16cde58d0314f5d98202a80c9083b5f61178457403dfb14e509c"
40724072
"checksum miniz_oxide_c_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "28edaef377517fd9fe3e085c37d892ce7acd1fbeab9239c5a36eec352d8a8b7e"

src/liballoc/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,7 @@
5555
reason = "this library is unlikely to be stabilized in its current \
5656
form or name",
5757
issue = "27783")]
58-
#![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
59-
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
60-
html_root_url = "https://doc.rust-lang.org/nightly/",
58+
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/",
6159
issue_tracker_base_url = "https://github.com/rust-lang/rust/issues/",
6260
test(no_crate_inject, attr(allow(unused_variables), deny(warnings))))]
6361
#![no_std]

src/libarena/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
//! This crate implements `TypedArena`, a simple arena that can only hold
99
//! objects of a single type.
1010
11-
#![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
12-
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
13-
html_root_url = "https://doc.rust-lang.org/nightly/",
11+
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/",
1412
test(no_crate_inject, attr(deny(warnings))))]
1513

1614
#![feature(alloc)]

src/libcore/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,7 @@
5151
#![cfg(not(test))]
5252

5353
#![stable(feature = "core", since = "1.6.0")]
54-
#![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
55-
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
56-
html_root_url = "https://doc.rust-lang.org/nightly/",
54+
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/",
5755
html_playground_url = "https://play.rust-lang.org/",
5856
issue_tracker_base_url = "https://github.com/rust-lang/rust/issues/",
5957
test(no_crate_inject, attr(deny(warnings))),

src/libcore/mem.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ use ptr;
1515
use ops::{Deref, DerefMut};
1616

1717
#[stable(feature = "rust1", since = "1.0.0")]
18+
#[doc(inline)]
1819
pub use intrinsics::transmute;
1920

2021
/// Takes ownership and "forgets" about the value **without running its destructor**.

src/libfmt_macros/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
//! Parsing does not happen at runtime: structures of `std::fmt::rt` are
55
//! generated instead.
66
7-
#![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
8-
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
9-
html_root_url = "https://doc.rust-lang.org/nightly/",
7+
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/",
108
html_playground_url = "https://play.rust-lang.org/",
119
test(attr(deny(warnings))))]
1210

src/libgraphviz/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -271,9 +271,7 @@
271271
//!
272272
//! * [DOT language](http://www.graphviz.org/doc/info/lang.html)
273273
274-
#![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
275-
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
276-
html_root_url = "https://doc.rust-lang.org/nightly/",
274+
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/",
277275
test(attr(allow(unused_variables), deny(warnings))))]
278276

279277
#![deny(rust_2018_idioms)]

src/libpanic_abort/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
66
#![no_std]
77
#![unstable(feature = "panic_abort", issue = "32837")]
8-
#![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
9-
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
10-
html_root_url = "https://doc.rust-lang.org/nightly/",
8+
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/",
119
issue_tracker_base_url = "https://github.com/rust-lang/rust/issues/")]
1210
#![panic_runtime]
1311

src/libpanic_unwind/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
1515
#![no_std]
1616
#![unstable(feature = "panic_unwind", issue = "32837")]
17-
#![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
18-
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
19-
html_root_url = "https://doc.rust-lang.org/nightly/",
17+
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/",
2018
issue_tracker_base_url = "https://github.com/rust-lang/rust/issues/")]
2119

2220
#![feature(allocator_api)]

src/libproc_macro/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
1010
#![stable(feature = "proc_macro_lib", since = "1.15.0")]
1111
#![deny(missing_docs)]
12-
#![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
13-
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
14-
html_root_url = "https://doc.rust-lang.org/nightly/",
12+
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/",
1513
html_playground_url = "https://play.rust-lang.org/",
1614
issue_tracker_base_url = "https://github.com/rust-lang/rust/issues/",
1715
test(no_crate_inject, attr(deny(warnings))),

0 commit comments

Comments
 (0)