Skip to content

Commit d676386

Browse files
Fix index-page generation
1 parent 4eff852 commit d676386

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

Cargo.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -1513,7 +1513,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
15131513

15141514
[[package]]
15151515
name = "minifier"
1516-
version = "0.0.29"
1516+
version = "0.0.30"
15171517
source = "registry+https://github.com/rust-lang/crates.io-index"
15181518
dependencies = [
15191519
"macro-utils 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3018,7 +3018,7 @@ dependencies = [
30183018
name = "rustdoc"
30193019
version = "0.0.0"
30203020
dependencies = [
3021-
"minifier 0.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
3021+
"minifier 0.0.30 (registry+https://github.com/rust-lang/crates.io-index)",
30223022
"parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
30233023
"pulldown-cmark 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
30243024
"tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4148,7 +4148,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
41484148
"checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39"
41494149
"checksum memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e2ffa2c986de11a9df78620c01eeaaf27d94d3ff02bf81bfcca953102dd0c6ff"
41504150
"checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3"
4151-
"checksum minifier 0.0.29 (registry+https://github.com/rust-lang/crates.io-index)" = "1f4950cb2617b1933e2da0446e864dfe0d6a22c22ff72297996c46e6a63b210b"
4151+
"checksum minifier 0.0.30 (registry+https://github.com/rust-lang/crates.io-index)" = "4c909e78edf61f3aa0dd2086da168cdf304329044bbf248768ca3d20253ec8c0"
41524152
"checksum miniz-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "0300eafb20369952951699b68243ab4334f4b10a88f411c221d444b36c40e649"
41534153
"checksum miniz_oxide 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5ad30a47319c16cde58d0314f5d98202a80c9083b5f61178457403dfb14e509c"
41544154
"checksum miniz_oxide_c_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "28edaef377517fd9fe3e085c37d892ce7acd1fbeab9239c5a36eec352d8a8b7e"

src/librustdoc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ path = "lib.rs"
1010

1111
[dependencies]
1212
pulldown-cmark = { version = "0.4.1", default-features = false }
13-
minifier = "0.0.29"
13+
minifier = "0.0.30"
1414
tempfile = "3"
1515
parking_lot = "0.7"

src/librustdoc/html/render.rs

+6-1
Original file line numberDiff line numberDiff line change
@@ -1340,10 +1340,15 @@ fn write_minify_replacer<W: Write>(
13401340
.into();
13411341
tokens.apply(|f| {
13421342
// We add a backline after the newly created variables.
1343-
minifier::js::aggregate_strings_into_array_with_separation(
1343+
minifier::js::aggregate_strings_into_array_with_separation_filter(
13441344
f,
13451345
"R",
13461346
Token::Char(ReservedChar::Backline),
1347+
|tokens, pos| {
1348+
pos < 2 ||
1349+
!tokens[pos - 1].is_char(ReservedChar::OpenBracket) ||
1350+
tokens[pos - 2].get_other() != Some("searchIndex")
1351+
}
13471352
)
13481353
})
13491354
.to_string()

0 commit comments

Comments
 (0)