Fix index-page generation

[GuillaumeGomez]

Fixes #60096.

The minifier was minifying crates name in searchIndex key position, which was a bit problematic for multiple reasons.

r? @rust-lang/rustdoc

[bors]

☔ The latest upstream changes (presumably #60140) made this pull request unmergeable. Please resolve the merge conflicts.

[GuillaumeGomez]

This one is quite a huge issue so it'd be nice to have it reviewed as soon as possible. :-/

r? @Manishearth

[Manishearth]

please leave a comment here explaining why this is necessary

[ollie27]

At the very least this needs a test.

[GuillaumeGomez]

@ollie27 To test it, we need two things:

1. A test to check output JS (which must work, whatever the minification used)
2. To compile multiple crates at once since this bug only occurs at this time.

I can do it, but considering the amount of code necessary, this promise to be complicated to maintain...

[ollie27]

Changing src/test/rustdoc/index-page.rs to:

// aux-build:all-item-types.rs
// build-aux-docs
// compile-flags: -Z unstable-options --enable-index-page

#![crate_name = "foo"]

// @has foo/../index.html
// @has - '//span[@class="in-band"]' 'List of all crates'
// @has - '//ul[@class="mod"]//a[@href="foo/index.html"]' 'foo'
// @has - '//ul[@class="mod"]//a[@href="all_item_types/index.html"]' 'all_item_types'
pub struct Foo;

is enough to test for #60096.

Also now that crate names are no longer minified this code should be removed:

rust/src/librustdoc/html/render.rs

Lines 967 to 987 in bfb443e

	// We need to check if the crate name has been put into a variable as well.
	let tokens: js::Tokens<'_> = js::simple_minify(&line)
	.into_iter()
	.filter(js::clean_token)
	.collect::<Vec<_>>()
	.into();
	let mut pos = 0;
	while pos < tokens.len() {
	if let Some((var_pos, Some(value_pos))) =
	js::get_variable_name_and_value_positions(&tokens, pos) {
	if let Some(s) = tokens.0[value_pos].get_string() {
	if &s[1..s.len() - 1] == krate {
	if let Some(var) = tokens[var_pos].get_other() {
	krate = var.to_owned();
	break
	}
	}
	}
	}
	pos += 1;
	}

[GuillaumeGomez]

@ollie27: Good catch! Completely forgot about this part...

[GuillaumeGomez]

Updated!

[Manishearth]

"This closure prevents crates' names from being aggregated."

I'm not sure what the second sentence means. And this doesn't explain how the OpenBracket or searchIndex check work.

[GuillaumeGomez]

I'm not sure what the second sentence means. And this doesn't explain how the OpenBracket or searchIndex check work.

Ah? I'll reword it then...

[GuillaumeGomez]

@Manishearth Are the explanations more clear this way or is there something else I need to clarify?

[Manishearth]

@bors r+

thanks!

[bors]

📌 Commit 6aa5a5d has been approved by Manishearth

[bors]

⌛ Testing commit 6aa5a5d with merge 180edc2...