Remove useless code and update index page test
This commit is contained in:
parent
d676386b1e
commit
f199627e69
2 changed files with 5 additions and 25 deletions
|
@ -951,40 +951,15 @@ themePicker.onblur = handleThemeButtonsBlur;
|
||||||
key: &str,
|
key: &str,
|
||||||
for_search_index: bool,
|
for_search_index: bool,
|
||||||
) -> io::Result<(Vec<String>, Vec<String>, Vec<String>)> {
|
) -> io::Result<(Vec<String>, Vec<String>, Vec<String>)> {
|
||||||
use minifier::js;
|
|
||||||
|
|
||||||
let mut ret = Vec::new();
|
let mut ret = Vec::new();
|
||||||
let mut krates = Vec::new();
|
let mut krates = Vec::new();
|
||||||
let mut variables = Vec::new();
|
let mut variables = Vec::new();
|
||||||
|
|
||||||
let mut krate = krate.to_owned();
|
|
||||||
|
|
||||||
if path.exists() {
|
if path.exists() {
|
||||||
for line in BufReader::new(File::open(path)?).lines() {
|
for line in BufReader::new(File::open(path)?).lines() {
|
||||||
let line = line?;
|
let line = line?;
|
||||||
if for_search_index && line.starts_with("var R") {
|
if for_search_index && line.starts_with("var R") {
|
||||||
variables.push(line.clone());
|
variables.push(line.clone());
|
||||||
// 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;
|
|
||||||
}
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if !line.starts_with(key) {
|
if !line.starts_with(key) {
|
||||||
|
@ -1344,6 +1319,8 @@ fn write_minify_replacer<W: Write>(
|
||||||
f,
|
f,
|
||||||
"R",
|
"R",
|
||||||
Token::Char(ReservedChar::Backline),
|
Token::Char(ReservedChar::Backline),
|
||||||
|
// This closure prevents crates' name to be aggregated. It allows to not
|
||||||
|
// have to look for crate's name into the strings array.
|
||||||
|tokens, pos| {
|
|tokens, pos| {
|
||||||
pos < 2 ||
|
pos < 2 ||
|
||||||
!tokens[pos - 1].is_char(ReservedChar::OpenBracket) ||
|
!tokens[pos - 1].is_char(ReservedChar::OpenBracket) ||
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
// aux-build:all-item-types.rs
|
||||||
|
// build-aux-docs
|
||||||
// compile-flags: -Z unstable-options --enable-index-page
|
// compile-flags: -Z unstable-options --enable-index-page
|
||||||
|
|
||||||
#![crate_name = "foo"]
|
#![crate_name = "foo"]
|
||||||
|
@ -5,4 +7,5 @@
|
||||||
// @has foo/../index.html
|
// @has foo/../index.html
|
||||||
// @has - '//span[@class="in-band"]' 'List of all crates'
|
// @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="foo/index.html"]' 'foo'
|
||||||
|
// @has - '//ul[@class="mod"]//a[@href="all_item_types/index.html"]' 'all_item_types'
|
||||||
pub struct Foo;
|
pub struct Foo;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue