diff --git a/src/liballoc/string.rs b/src/liballoc/string.rs index 11fb82c09d3aa..2f84d5f7f8676 100644 --- a/src/liballoc/string.rs +++ b/src/liballoc/string.rs @@ -1521,9 +1521,6 @@ impl String { /// and replaces it with the given string. /// The given string doesn't need to be the same length as the range. /// - /// Note: Unlike [`Vec::splice`], the replacement happens eagerly, and this - /// method does not return the removed chars. - /// /// # Panics /// /// Panics if the starting point or end point do not lie on a [`char`] diff --git a/src/librustdoc/html/layout.rs b/src/librustdoc/html/layout.rs index aac5d0d2601de..583c9f2b67144 100644 --- a/src/librustdoc/html/layout.rs +++ b/src/librustdoc/html/layout.rs @@ -37,128 +37,116 @@ pub fn render( -> io::Result<()> { write!(dst, -r##" - - - - - - - - - {title} - - - - {themes} - - - - {css_extension} - - {favicon} - {in_header} - - - - - {before_content} - - - -
- -
-
- - - -
{content}
- - -
- - - - {after_content} - - - - - -"##, +"\ +\ +\ + \ + \ + \ + \ + \ + {title}\ + \ + \ + {themes}\ + \ + \ + \ + {css_extension}\ + {favicon}\ + {in_header}\ +\ +\ + \ + {before_content}\ + \ +
\ + \ +
\ +
\ + \ + \ +
{content}
\ +
\ +
\ + \ + {after_content}\ + \ + \ + \ +\ +", css_extension = if css_file_extension { format!("", root_path = page.root_path, diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs index abeaef723d487..651319743aadd 100644 --- a/src/librustdoc/html/render.rs +++ b/src/librustdoc/html/render.rs @@ -1728,7 +1728,9 @@ impl Context { let mut dst = try_err!(File::create(&joint_dst), &joint_dst); try_err!(dst.write_all(&buf), &joint_dst); - all.append(full_path(self, &item), &item_type); + if !self.render_redirect_pages { + all.append(full_path(self, &item), &item_type); + } // Redirect from a sane URL using the namespace to Rustdoc's // URL for the page. let redir_name = format!("{}.{}.html", name, item_type.name_space()); diff --git a/src/librustdoc/html/static/main.js b/src/librustdoc/html/static/main.js index 3a3fa833c238b..2546a9410a9f6 100644 --- a/src/librustdoc/html/static/main.js +++ b/src/librustdoc/html/static/main.js @@ -1299,14 +1299,78 @@ printTab(currentTab); } + function execSearch(query, searchWords) { + var queries = query.raw.split(","); + var results = { + 'in_args': [], + 'returned': [], + 'others': [], + }; + + for (var i = 0; i < queries.length; ++i) { + var query = queries[i].trim(); + if (query.length !== 0) { + var tmp = execQuery(getQuery(query), searchWords); + + results['in_args'].push(tmp['in_args']); + results['returned'].push(tmp['returned']); + results['others'].push(tmp['others']); + } + } + if (queries.length > 1) { + function getSmallest(arrays, positions) { + var start = null; + + for (var it = 0; it < positions.length; ++it) { + if (arrays[it].length > positions[it] && + (start === null || start > arrays[it][positions[it]].lev)) { + start = arrays[it][positions[it]].lev; + } + } + return start; + } + + function mergeArrays(arrays) { + var ret = []; + var positions = []; + + for (var x = 0; x < arrays.length; ++x) { + positions.push(0); + } + while (ret.length < MAX_RESULTS) { + var smallest = getSmallest(arrays, positions); + if (smallest === null) { + break; + } + for (x = 0; x < arrays.length && ret.length < MAX_RESULTS; ++x) { + if (arrays[x].length > positions[x] && + arrays[x][positions[x]].lev === smallest) { + ret.push(arrays[x][positions[x]]); + positions[x] += 1; + } + } + } + return ret; + } + + return { + 'in_args': mergeArrays(results['in_args']), + 'returned': mergeArrays(results['returned']), + 'others': mergeArrays(results['others']), + }; + } else { + return { + 'in_args': results['in_args'][0], + 'returned': results['returned'][0], + 'others': results['others'][0], + }; + } + } + function search(e) { - var query, - obj, i, len, - results = {"in_args": [], "returned": [], "others": []}, - resultIndex; var params = getQueryStringParams(); + var query = getQuery(document.getElementsByClassName('search-input')[0].value); - query = getQuery(document.getElementsByClassName('search-input')[0].value); if (e) { e.preventDefault(); } @@ -1328,8 +1392,7 @@ } } - results = execQuery(query, index); - showResults(results); + showResults(execSearch(query, index)); } function buildIndex(rawSearchIndex) { diff --git a/src/libsyntax_pos/symbol.rs b/src/libsyntax_pos/symbol.rs index 331b0fe5481d5..50fac600a978d 100644 --- a/src/libsyntax_pos/symbol.rs +++ b/src/libsyntax_pos/symbol.rs @@ -336,24 +336,23 @@ declare_keywords! { (46, Offsetof, "offsetof") (47, Override, "override") (48, Priv, "priv") - (49, Proc, "proc") - (50, Pure, "pure") - (51, Sizeof, "sizeof") - (52, Typeof, "typeof") - (53, Unsized, "unsized") - (54, Virtual, "virtual") - (55, Yield, "yield") + (49, Pure, "pure") + (50, Sizeof, "sizeof") + (51, Typeof, "typeof") + (52, Unsized, "unsized") + (53, Virtual, "virtual") + (54, Yield, "yield") // Special lifetime names - (56, UnderscoreLifetime, "'_") - (57, StaticLifetime, "'static") + (55, UnderscoreLifetime, "'_") + (56, StaticLifetime, "'static") // Weak keywords, have special meaning only in specific contexts. - (58, Auto, "auto") - (59, Catch, "catch") - (60, Default, "default") - (61, Dyn, "dyn") - (62, Union, "union") + (57, Auto, "auto") + (58, Catch, "catch") + (59, Default, "default") + (60, Dyn, "dyn") + (61, Union, "union") } // If an interner exists, return it. Otherwise, prepare a fresh one. diff --git a/src/test/parse-fail/obsolete-proc.rs b/src/test/rustdoc-js/multi-query.js similarity index 53% rename from src/test/parse-fail/obsolete-proc.rs rename to src/test/rustdoc-js/multi-query.js index 648c46d246cbc..3793ca6599c5f 100644 --- a/src/test/parse-fail/obsolete-proc.rs +++ b/src/test/rustdoc-js/multi-query.js @@ -1,4 +1,4 @@ -// Copyright 2014 The Rust Project Developers. See the COPYRIGHT +// Copyright 2018 The Rust Project Developers. See the COPYRIGHT // file at the top-level directory of this distribution and at // http://rust-lang.org/COPYRIGHT. // @@ -8,12 +8,13 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// compile-flags: -Z parse-only +const QUERY = 'str,u8'; -// Test that we generate obsolete syntax errors around usages of `proc`. - -fn foo(p: proc()) { } //~ ERROR expected type, found reserved keyword `proc` - -fn bar() { proc() 1; } //~ ERROR expected expression, found reserved keyword `proc` - -fn main() { } +const EXPECTED = { + 'others': [ + { 'path': 'std', 'name': 'str' }, + { 'path': 'std', 'name': 'u8' }, + { 'path': 'std::ffi', 'name': 'CStr' }, + { 'path': 'std::simd', 'name': 'u8x2' }, + ], +}; diff --git a/src/test/rustdoc/all.rs b/src/test/rustdoc/all.rs index ec391319b183c..1969cf859eee4 100644 --- a/src/test/rustdoc/all.rs +++ b/src/test/rustdoc/all.rs @@ -28,3 +28,11 @@ pub union Union { pub const CONST: u32 = 0; pub static STATIC: &str = "baguette"; pub fn function() {} + +mod private_module { + pub struct ReexportedStruct; +} + +// @has foo/all.html '//a[@href="struct.ReexportedStruct.html"]' 'ReexportedStruct' +// @!has foo/all.html 'private_module' +pub use private_module::ReexportedStruct; diff --git a/src/tools/rustdoc-js/tester.js b/src/tools/rustdoc-js/tester.js index 7c9ee2a49430b..1e6c4336a9e99 100644 --- a/src/tools/rustdoc-js/tester.js +++ b/src/tools/rustdoc-js/tester.js @@ -157,7 +157,8 @@ function main(argv) { // execQuery first parameter is built in getQuery (which takes in the search input). // execQuery last parameter is built in buildIndex. // buildIndex requires the hashmap from search-index. - var functionsToLoad = ["levenshtein", "validateResult", "getQuery", "buildIndex", "execQuery"]; + var functionsToLoad = ["levenshtein", "validateResult", "getQuery", "buildIndex", "execQuery", + "execSearch"]; finalJS += 'window = { "currentCrate": "std" };\n'; finalJS += loadThings(arraysToLoad, 'array', extractArrayVariable, mainJs); @@ -174,7 +175,7 @@ function main(argv) { 'exports.QUERY = QUERY;exports.EXPECTED = EXPECTED;'); const expected = loadedFile.EXPECTED; const query = loadedFile.QUERY; - var results = loaded.execQuery(loaded.getQuery(query), index); + var results = loaded.execSearch(loaded.getQuery(query), index); process.stdout.write('Checking "' + file + '" ... '); var error_text = []; for (var key in expected) {