Skip to content

Commit aedaa7f

Browse files
authored
Unrolled build for #143155
Rollup merge of #143155 - yotamofek:pr/rustdoc/housekeeping, r=GuillaumeGomez `librustdoc` house-keeping 🧹 This PR mostly removes a bunch of crate-level attributes that were added at some point, but then later on became unnecessary: - some `#[feature]` gates - some `#[allow]`s - a `#[recursion_limit]` Then I went ahead and sprinkled some tidy sorting on the remaining attrs, and `Cargo.toml`. Trying to give my anal retentiveness some peace of mind 😅
2 parents dddd7ab + 581cb11 commit aedaa7f

File tree

2 files changed

+8
-12
lines changed

2 files changed

+8
-12
lines changed

src/librustdoc/Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,25 @@ build = "build.rs"
88
path = "lib.rs"
99

1010
[dependencies]
11+
# tidy-alphabetical-start
1112
arrayvec = { version = "0.7", default-features = false }
1213
askama = { version = "0.14", default-features = false, features = ["alloc", "config", "derive"] }
1314
base64 = "0.21.7"
14-
itertools = "0.12"
1515
indexmap = "2"
16+
itertools = "0.12"
1617
minifier = { version = "0.3.5", default-features = false }
1718
pulldown-cmark-escape = { version = "0.11.0", features = ["simd"] }
1819
regex = "1"
1920
rustdoc-json-types = { path = "../rustdoc-json-types" }
20-
serde_json = "1.0"
2121
serde = { version = "1.0", features = ["derive"] }
22+
serde_json = "1.0"
2223
smallvec = "1.8.1"
2324
tempfile = "3"
25+
threadpool = "1.8.1"
2426
tracing = "0.1"
2527
tracing-tree = "0.3.0"
26-
threadpool = "1.8.1"
2728
unicode-segmentation = "1.9"
29+
# tidy-alphabetical-end
2830

2931
[dependencies.tracing-subscriber]
3032
version = "0.3.3"

src/librustdoc/lib.rs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
// tidy-alphabetical-start
12
#![doc(
23
html_root_url = "https://doc.rust-lang.org/nightly/",
34
html_playground_url = "https://play.rust-lang.org/"
45
)]
5-
#![feature(rustc_private)]
66
#![feature(ascii_char)]
77
#![feature(ascii_char_variants)]
88
#![feature(assert_matches)]
@@ -11,18 +11,12 @@
1111
#![feature(file_buffered)]
1212
#![feature(format_args_nl)]
1313
#![feature(if_let_guard)]
14-
#![feature(impl_trait_in_assoc_type)]
1514
#![feature(iter_intersperse)]
16-
#![feature(never_type)]
1715
#![feature(round_char_boundary)]
16+
#![feature(rustc_private)]
1817
#![feature(test)]
19-
#![feature(type_alias_impl_trait)]
20-
#![feature(type_ascription)]
21-
#![recursion_limit = "256"]
2218
#![warn(rustc::internal)]
23-
#![allow(clippy::collapsible_if, clippy::collapsible_else_if)]
24-
#![allow(rustc::diagnostic_outside_of_impl)]
25-
#![allow(rustc::untranslatable_diagnostic)]
19+
// tidy-alphabetical-end
2620

2721
extern crate thin_vec;
2822

0 commit comments

Comments
 (0)