From bccb9f7a59ff69518e235bba3772d483c04266cd Mon Sep 17 00:00:00 2001 From: Michael Howell Date: Wed, 5 Jun 2024 10:03:44 -0700 Subject: [PATCH] rustdoc: fold path to lower case, but preserve original name This fixes the "About This Result" page so that it shows the case of type parameters in the query. --- src/librustdoc/html/static/js/search.js | 32 ++++++---- src/tools/rustdoc-js/tester.js | 1 - tests/rustdoc-gui/search-corrections.goml | 12 ++-- tests/rustdoc-js-std/parser-bindings.js | 50 ++++++--------- tests/rustdoc-js-std/parser-errors.js | 65 ++----------------- tests/rustdoc-js-std/parser-filter.js | 9 --- tests/rustdoc-js-std/parser-generics.js | 8 +-- tests/rustdoc-js-std/parser-hof.js | 66 +++++++------------- tests/rustdoc-js-std/parser-ident.js | 21 ++----- tests/rustdoc-js-std/parser-literal.js | 7 +-- tests/rustdoc-js-std/parser-paths.js | 31 ++++----- tests/rustdoc-js-std/parser-quote.js | 7 --- tests/rustdoc-js-std/parser-reference.js | 55 ++++++---------- tests/rustdoc-js-std/parser-returned.js | 15 ++--- tests/rustdoc-js-std/parser-separators.js | 8 --- tests/rustdoc-js-std/parser-slice-array.js | 56 ++++++----------- tests/rustdoc-js-std/parser-tuple.js | 65 +++++++------------ tests/rustdoc-js-std/parser-weird-queries.js | 18 ++---- tests/rustdoc-js/type-parameters.js | 7 +++ 19 files changed, 174 insertions(+), 359 deletions(-) diff --git a/src/librustdoc/html/static/js/search.js b/src/librustdoc/html/static/js/search.js index 7a5e73ab29159..e1818dab1d5a1 100644 --- a/src/librustdoc/html/static/js/search.js +++ b/src/librustdoc/html/static/js/search.js @@ -585,7 +585,7 @@ function initSearch(rawSearchIndex) { } else if (quadcolon !== null) { throw ["Unexpected ", quadcolon[0]]; } - const pathSegments = path.split(/(?:::\s*)|(?:\s+(?:::\s*)?)/); + const pathSegments = path.split(/(?:::\s*)|(?:\s+(?:::\s*)?)/).map(x => x.toLowerCase()); // In case we only have something like `

`, there is no name. if (pathSegments.length === 0 || (pathSegments.length === 1 && pathSegments[0] === "")) { if (generics.length > 0 || prevIs(parserState, ">")) { @@ -624,7 +624,10 @@ function initSearch(rawSearchIndex) { if (gen.name !== null) { gen.bindingName.generics.unshift(gen); } - bindings.set(gen.bindingName.name, gen.bindingName.generics); + bindings.set( + gen.bindingName.name.toLowerCase().replace(/_/g, ""), + gen.bindingName.generics, + ); return false; } return true; @@ -1204,8 +1207,7 @@ function initSearch(rawSearchIndex) { */ function newParsedQuery(userQuery) { return { - original: userQuery, - userQuery: userQuery.toLowerCase(), + userQuery: userQuery, elems: [], returned: [], // Total number of "top" elements (does not include generics). @@ -1297,7 +1299,7 @@ function initSearch(rawSearchIndex) { genericsElems: 0, typeFilter: null, isInBinding: null, - userQuery: userQuery.toLowerCase(), + userQuery, }; let query = newParsedQuery(userQuery); @@ -2781,21 +2783,25 @@ function initSearch(rawSearchIndex) { if ((elem.id === null && parsedQuery.totalElems > 1 && elem.typeFilter === -1 && elem.generics.length === 0 && elem.bindings.size === 0) || elem.typeFilter === TY_GENERIC) { - if (genericSymbols.has(elem.name)) { - elem.id = genericSymbols.get(elem.name); + if (genericSymbols.has(elem.normalizedPathLast)) { + elem.id = genericSymbols.get(elem.normalizedPathLast); } else { elem.id = -(genericSymbols.size + 1); - genericSymbols.set(elem.name, elem.id); + genericSymbols.set(elem.normalizedPathLast, elem.id); } - if (elem.typeFilter === -1 && elem.name.length >= 3) { + if (elem.typeFilter === -1 && elem.normalizedPathLast.length >= 3) { // Silly heuristic to catch if the user probably meant // to not write a generic parameter. We don't use it, // just bring it up. - const maxPartDistance = Math.floor(elem.name.length / 3); + const maxPartDistance = Math.floor(elem.normalizedPathLast.length / 3); let matchDist = maxPartDistance + 1; let matchName = ""; for (const name of typeNameIdMap.keys()) { - const dist = editDistance(name, elem.name, maxPartDistance); + const dist = editDistance( + name, + elem.normalizedPathLast, + maxPartDistance, + ); if (dist <= matchDist && dist <= maxPartDistance) { if (dist === matchDist && matchName > name) { continue; @@ -3356,11 +3362,11 @@ ${item.displayPath}${name}\ } // Update document title to maintain a meaningful browser history - searchState.title = "Results for " + query.original + " - Rust"; + searchState.title = "Results for " + query.userQuery + " - Rust"; // Because searching is incremental by character, only the most // recent search query is added to the browser history. - updateSearchHistory(buildUrl(query.original, filterCrates)); + updateSearchHistory(buildUrl(query.userQuery, filterCrates)); await showResults( await execQuery(query, filterCrates, window.currentCrate), diff --git a/src/tools/rustdoc-js/tester.js b/src/tools/rustdoc-js/tester.js index 60a9b5920723f..cf7ab190b90fc 100644 --- a/src/tools/rustdoc-js/tester.js +++ b/src/tools/rustdoc-js/tester.js @@ -91,7 +91,6 @@ function checkNeededFields(fullPath, expected, error_text, queryName, position) if (fullPath.length === 0) { fieldsToCheck = [ "foundElems", - "original", "returned", "userQuery", "error", diff --git a/tests/rustdoc-gui/search-corrections.goml b/tests/rustdoc-gui/search-corrections.goml index b81b1f382a957..f80675730c41a 100644 --- a/tests/rustdoc-gui/search-corrections.goml +++ b/tests/rustdoc-gui/search-corrections.goml @@ -24,7 +24,7 @@ assert-css: (".search-corrections", { }) assert-text: ( ".search-corrections", - "Type \"notablestructwithlongnamr\" not found. Showing results for closest type name \"notablestructwithlongname\" instead." + "Type \"NotableStructWithLongNamr\" not found. Showing results for closest type name \"notablestructwithlongname\" instead." ) // Corrections do get shown on the "In Return Type" tab. @@ -35,7 +35,7 @@ assert-css: (".search-corrections", { }) assert-text: ( ".search-corrections", - "Type \"notablestructwithlongnamr\" not found. Showing results for closest type name \"notablestructwithlongname\" instead." + "Type \"NotableStructWithLongNamr\" not found. Showing results for closest type name \"notablestructwithlongname\" instead." ) // Now, explicit return values @@ -52,7 +52,7 @@ assert-css: (".search-corrections", { }) assert-text: ( ".search-corrections", - "Type \"notablestructwithlongnamr\" not found. Showing results for closest type name \"notablestructwithlongname\" instead." + "Type \"NotableStructWithLongNamr\" not found. Showing results for closest type name \"notablestructwithlongname\" instead." ) // Now, generic correction @@ -69,7 +69,7 @@ assert-css: (".search-corrections", { }) assert-text: ( ".search-corrections", - "Type \"notablestructwithlongnamr\" not found and used as generic parameter. Consider searching for \"notablestructwithlongname\" instead." + "Type \"NotableStructWithLongNamr\" not found and used as generic parameter. Consider searching for \"notablestructwithlongname\" instead." ) // Now, generic correction plus error @@ -86,7 +86,7 @@ assert-css: (".search-corrections", { }) assert-text: ( ".search-corrections", - "Type \"notablestructwithlongnamr\" not found and used as generic parameter. Consider searching for \"notablestructwithlongname\" instead." + "Type \"NotableStructWithLongNamr\" not found and used as generic parameter. Consider searching for \"notablestructwithlongname\" instead." ) go-to: "file://" + |DOC_PATH| + "/test_docs/index.html" @@ -102,5 +102,5 @@ assert-css: (".error", { }) assert-text: ( ".error", - "Query parser error: \"Generic type parameter notablestructwithlongnamr does not accept generic parameters\"." + "Query parser error: \"Generic type parameter NotableStructWithLongNamr does not accept generic parameters\"." ) diff --git a/tests/rustdoc-js-std/parser-bindings.js b/tests/rustdoc-js-std/parser-bindings.js index c4909c6242d75..8518b32c7ae6d 100644 --- a/tests/rustdoc-js-std/parser-bindings.js +++ b/tests/rustdoc-js-std/parser-bindings.js @@ -3,7 +3,7 @@ const PARSED = [ query: 'A', elems: [ { - name: "a", + name: "A", fullPath: ["a"], pathWithoutLast: [], pathLast: "a", @@ -13,7 +13,7 @@ const PARSED = [ 'b', [ { - name: "c", + name: "C", fullPath: ["c"], pathWithoutLast: [], pathLast: "c", @@ -27,16 +27,15 @@ const PARSED = [ }, ], foundElems: 1, - original: 'A', + userQuery: 'A', returned: [], - userQuery: 'a', error: null, }, { query: 'A', elems: [ { - name: "a", + name: "A", fullPath: ["a"], pathWithoutLast: [], pathLast: "a", @@ -45,7 +44,7 @@ const PARSED = [ [ 'b', [{ - name: "c", + name: "C", fullPath: ["c"], pathWithoutLast: [], pathLast: "c", @@ -58,16 +57,15 @@ const PARSED = [ }, ], foundElems: 1, - original: 'A', + userQuery: 'A', returned: [], - userQuery: 'a', error: null, }, { query: 'A', elems: [ { - name: "a", + name: "A", fullPath: ["a"], pathWithoutLast: [], pathLast: "a", @@ -89,16 +87,15 @@ const PARSED = [ }, ], foundElems: 1, - original: 'A', + userQuery: 'A', returned: [], - userQuery: 'a', error: null, }, { query: 'A', elems: [ { - name: "a", + name: "A", fullPath: ["a"], pathWithoutLast: [], pathLast: "a", @@ -120,16 +117,15 @@ const PARSED = [ }, ], foundElems: 1, - original: 'A', + userQuery: 'A', returned: [], - userQuery: 'a', error: null, }, { query: 'A', elems: [ { - name: "a", + name: "A", fullPath: ["a"], pathWithoutLast: [], pathLast: "a", @@ -160,52 +156,47 @@ const PARSED = [ }, ], foundElems: 1, - original: 'A', + userQuery: 'A', returned: [], - userQuery: 'a', error: null, }, { query: 'A', elems: [], foundElems: 0, - original: 'A', + userQuery: 'A', returned: [], - userQuery: 'a', error: "Cannot write `=` twice in a binding", }, { query: 'A', elems: [], foundElems: 0, - original: 'A', + userQuery: 'A', returned: [], - userQuery: 'a', error: "Unexpected `>` after `=`", }, { query: 'B=C', elems: [], foundElems: 0, - original: 'B=C', + userQuery: 'B=C', returned: [], - userQuery: 'b=c', error: "Type parameter `=` must be within generics list", }, { query: '[B=C]', elems: [], foundElems: 0, - original: '[B=C]', + userQuery: '[B=C]', returned: [], - userQuery: '[b=c]', error: "Type parameter `=` cannot be within slice `[]`", }, { query: 'A=C>', elems: [ { - name: "a", + name: "A", fullPath: ["a"], pathWithoutLast: [], pathLast: "a", @@ -215,7 +206,7 @@ const PARSED = [ 'b', [ { - name: "c", + name: "C", fullPath: ["c"], pathWithoutLast: [], pathLast: "c", @@ -223,7 +214,7 @@ const PARSED = [ typeFilter: -1, }, { - name: "x", + name: "X", fullPath: ["x"], pathWithoutLast: [], pathLast: "x", @@ -237,9 +228,8 @@ const PARSED = [ }, ], foundElems: 1, - original: 'A=C>', + userQuery: 'A=C>', returned: [], - userQuery: 'a=c>', error: null, }, ]; diff --git a/tests/rustdoc-js-std/parser-errors.js b/tests/rustdoc-js-std/parser-errors.js index c4d7c2b0b8597..54b4501202634 100644 --- a/tests/rustdoc-js-std/parser-errors.js +++ b/tests/rustdoc-js-std/parser-errors.js @@ -3,25 +3,22 @@ const PARSED = [ query: '

', elems: [], foundElems: 0, - original: "

", + userQuery: "

", returned: [], - userQuery: "

", error: "Found generics without a path", }, { query: '->

', elems: [], foundElems: 0, - original: "->

", + userQuery: "->

", returned: [], - userQuery: "->

", error: "Found generics without a path", }, { query: '-> *', elems: [], foundElems: 0, - original: "-> *", returned: [], userQuery: "-> *", error: "Unexpected `*` after ` ` (not a valid identifier)", @@ -30,43 +27,38 @@ const PARSED = [ query: 'a<"P">', elems: [], foundElems: 0, - original: "a<\"P\">", + userQuery: "a<\"P\">", returned: [], - userQuery: "a<\"p\">", error: "Unexpected `\"` in generics", }, { query: '"P" "P"', elems: [], foundElems: 0, - original: "\"P\" \"P\"", + userQuery: "\"P\" \"P\"", returned: [], - userQuery: "\"p\" \"p\"", error: "Cannot have more than one element if you use quotes", }, { query: '"P","P"', elems: [], foundElems: 0, - original: "\"P\",\"P\"", + userQuery: "\"P\",\"P\"", returned: [], - userQuery: "\"p\",\"p\"", error: "Cannot have more than one literal search element", }, { query: "P,\"P\"", elems: [], foundElems: 0, - original: "P,\"P\"", + userQuery: "P,\"P\"", returned: [], - userQuery: "p,\"p\"", error: "Cannot use literal search when there is more than one element", }, { query: '"p" p', elems: [], foundElems: 0, - original: "\"p\" p", returned: [], userQuery: "\"p\" p", error: "Cannot have more than one element if you use quotes", @@ -75,7 +67,6 @@ const PARSED = [ query: '"p",p', elems: [], foundElems: 0, - original: "\"p\",p", returned: [], userQuery: "\"p\",p", error: "Cannot have more than one element if you use quotes", @@ -84,7 +75,6 @@ const PARSED = [ query: '"const": p', elems: [], foundElems: 0, - original: "\"const\": p", returned: [], userQuery: "\"const\": p", error: "Cannot use quotes on type filter", @@ -93,7 +83,6 @@ const PARSED = [ query: "a<:a>", elems: [], foundElems: 0, - original: "a<:a>", returned: [], userQuery: "a<:a>", error: "Expected type filter before `:`", @@ -102,7 +91,6 @@ const PARSED = [ query: "a<::a>", elems: [], foundElems: 0, - original: "a<::a>", returned: [], userQuery: "a<::a>", error: "Unexpected `::`: paths cannot start with `::`", @@ -111,7 +99,6 @@ const PARSED = [ query: "(p -> p", elems: [], foundElems: 0, - original: "(p -> p", returned: [], userQuery: "(p -> p", error: "Unclosed `(`", @@ -120,7 +107,6 @@ const PARSED = [ query: "::a::b", elems: [], foundElems: 0, - original: "::a::b", returned: [], userQuery: "::a::b", error: "Paths cannot start with `::`", @@ -129,7 +115,6 @@ const PARSED = [ query: " ::a::b", elems: [], foundElems: 0, - original: "::a::b", returned: [], userQuery: "::a::b", error: "Paths cannot start with `::`", @@ -138,7 +123,6 @@ const PARSED = [ query: "a::::b", elems: [], foundElems: 0, - original: "a::::b", returned: [], userQuery: "a::::b", error: "Unexpected `::::`", @@ -147,7 +131,6 @@ const PARSED = [ query: "a:: ::b", elems: [], foundElems: 0, - original: "a:: ::b", returned: [], userQuery: "a:: ::b", error: "Unexpected `:: ::`", @@ -156,7 +139,6 @@ const PARSED = [ query: "a::\t::b", elems: [], foundElems: 0, - original: "a:: ::b", returned: [], userQuery: "a:: ::b", error: "Unexpected `:: ::`", @@ -165,7 +147,6 @@ const PARSED = [ query: "a::b::", elems: [], foundElems: 0, - original: "a::b::", returned: [], userQuery: "a::b::", error: "Paths cannot end with `::`", @@ -174,7 +155,6 @@ const PARSED = [ query: ":a", elems: [], foundElems: 0, - original: ":a", returned: [], userQuery: ":a", error: "Expected type filter before `:`", @@ -183,7 +163,6 @@ const PARSED = [ query: "a,b:", elems: [], foundElems: 0, - original: "a,b:", returned: [], userQuery: "a,b:", error: "Unexpected `:` (expected path after type filter `b:`)", @@ -192,7 +171,6 @@ const PARSED = [ query: "a (b:", elems: [], foundElems: 0, - original: "a (b:", returned: [], userQuery: "a (b:", error: "Unclosed `(`", @@ -201,7 +179,6 @@ const PARSED = [ query: "_:", elems: [], foundElems: 0, - original: "_:", returned: [], userQuery: "_:", error: "Unexpected `_` (not a valid identifier)", @@ -210,7 +187,6 @@ const PARSED = [ query: "ab:", elems: [], foundElems: 0, - original: "ab:", returned: [], userQuery: "ab:", error: "Unexpected `:` (expected path after type filter `ab:`)", @@ -228,7 +204,6 @@ const PARSED = [ query: "a-bb", elems: [], foundElems: 0, - original: "a-bb", returned: [], userQuery: "a-bb", error: "Unexpected `-` (did you mean `->`?)", @@ -237,7 +212,6 @@ const PARSED = [ query: "a>bb", elems: [], foundElems: 0, - original: "a>bb", returned: [], userQuery: "a>bb", error: "Unexpected `>` (did you mean `->`?)", @@ -246,7 +220,6 @@ const PARSED = [ query: "ab'", elems: [], foundElems: 0, - original: "ab'", returned: [], userQuery: "ab'", error: "Unexpected `'` after `b` (not a valid identifier)", @@ -255,7 +228,6 @@ const PARSED = [ query: "a->", elems: [], foundElems: 0, - original: "a->", returned: [], userQuery: "a->", error: "Expected at least one item after `->`", @@ -264,7 +236,6 @@ const PARSED = [ query: '"p" ', elems: [], foundElems: 0, - original: '"p" ', returned: [], userQuery: '"p" ', error: "Cannot have more than one element if you use quotes", @@ -273,7 +244,6 @@ const PARSED = [ query: '"p",', elems: [], foundElems: 0, - original: '"p",', returned: [], userQuery: '"p",', error: "Found generics without a path", @@ -282,7 +252,6 @@ const PARSED = [ query: '"p" a', elems: [], foundElems: 0, - original: '"p" a', returned: [], userQuery: '"p" a', error: "Cannot have more than one element if you use quotes", @@ -291,7 +260,6 @@ const PARSED = [ query: '"p",a', elems: [], foundElems: 0, - original: '"p",a', returned: [], userQuery: '"p",a', error: "Cannot have more than one element if you use quotes", @@ -300,7 +268,6 @@ const PARSED = [ query: "a,<", elems: [], foundElems: 0, - original: 'a,<', returned: [], userQuery: 'a,<', error: 'Found generics without a path', @@ -309,7 +276,6 @@ const PARSED = [ query: "aaaaa<>b", elems: [], foundElems: 0, - original: 'aaaaa<>b', returned: [], userQuery: 'aaaaa<>b', error: 'Expected `,`, `:` or `->` after `>`, found `b`', @@ -318,7 +284,6 @@ const PARSED = [ query: "fn:aaaaa<>b", elems: [], foundElems: 0, - original: 'fn:aaaaa<>b', returned: [], userQuery: 'fn:aaaaa<>b', error: 'Expected `,`, `:` or `->` after `>`, found `b`', @@ -327,7 +292,6 @@ const PARSED = [ query: "->a<>b", elems: [], foundElems: 0, - original: '->a<>b', returned: [], userQuery: '->a<>b', error: 'Expected `,` or `=` after `>`, found `b`', @@ -336,7 +300,6 @@ const PARSED = [ query: "a<->", elems: [], foundElems: 0, - original: 'a<->', returned: [], userQuery: 'a<->', error: 'Unclosed `<`', @@ -345,7 +308,6 @@ const PARSED = [ query: "a:", elems: [], foundElems: 0, - original: "a:", returned: [], userQuery: "a:", error: 'Unexpected `<` in type filter (before `:`)', @@ -354,7 +316,6 @@ const PARSED = [ query: "a<>:", elems: [], foundElems: 0, - original: "a<>:", returned: [], userQuery: "a<>:", error: 'Unexpected `<` in type filter (before `:`)', @@ -363,7 +324,6 @@ const PARSED = [ query: "a,:", elems: [], foundElems: 0, - original: "a,:", returned: [], userQuery: "a,:", error: 'Expected type filter before `:`', @@ -372,7 +332,6 @@ const PARSED = [ query: "a!:", elems: [], foundElems: 0, - original: "a!:", returned: [], userQuery: "a!:", error: 'Unexpected `!` in type filter (before `:`)', @@ -381,7 +340,6 @@ const PARSED = [ query: " a<> :", elems: [], foundElems: 0, - original: "a<> :", returned: [], userQuery: "a<> :", error: 'Expected `,`, `:` or `->` after `>`, found `:`', @@ -390,7 +348,6 @@ const PARSED = [ query: "mod : :", elems: [], foundElems: 0, - original: "mod : :", returned: [], userQuery: "mod : :", error: 'Unexpected `:` (expected path after type filter `mod:`)', @@ -399,7 +356,6 @@ const PARSED = [ query: "mod: :", elems: [], foundElems: 0, - original: "mod: :", returned: [], userQuery: "mod: :", error: 'Unexpected `:` (expected path after type filter `mod:`)', @@ -408,7 +364,6 @@ const PARSED = [ query: "a!a", elems: [], foundElems: 0, - original: "a!a", returned: [], userQuery: "a!a", error: 'Unexpected `!`: it can only be at the end of an ident', @@ -417,7 +372,6 @@ const PARSED = [ query: "a!!", elems: [], foundElems: 0, - original: "a!!", returned: [], userQuery: "a!!", error: 'Cannot have more than one `!` in an ident', @@ -426,7 +380,6 @@ const PARSED = [ query: "mod:a!", elems: [], foundElems: 0, - original: "mod:a!", returned: [], userQuery: "mod:a!", error: 'Invalid search type: macro `!` and `mod` both specified', @@ -435,7 +388,6 @@ const PARSED = [ query: "mod:!", elems: [], foundElems: 0, - original: "mod:!", returned: [], userQuery: "mod:!", error: 'Invalid search type: primitive never type `!` and `mod` both specified', @@ -444,7 +396,6 @@ const PARSED = [ query: "a!::a", elems: [], foundElems: 0, - original: "a!::a", returned: [], userQuery: "a!::a", error: 'Cannot have associated items in macros', @@ -453,7 +404,6 @@ const PARSED = [ query: "a<", elems: [], foundElems: 0, - original: "a<", returned: [], userQuery: "a<", error: "Unclosed `<`", @@ -488,7 +438,6 @@ const PARSED = [ }, ], foundElems: 2, - original: "p , y", returned: [], userQuery: "p , y", error: null, @@ -523,7 +472,6 @@ const PARSED = [ }, ], foundElems: 1, - original: "p", returned: [], userQuery: "p", error: null, @@ -557,7 +505,6 @@ const PARSED = [ }, ], foundElems: 3, - original: "p ,x , y", returned: [], userQuery: "p ,x , y", error: null, diff --git a/tests/rustdoc-js-std/parser-filter.js b/tests/rustdoc-js-std/parser-filter.js index a1dd0ea3b5a99..c2a22c08dfc5e 100644 --- a/tests/rustdoc-js-std/parser-filter.js +++ b/tests/rustdoc-js-std/parser-filter.js @@ -10,7 +10,6 @@ const PARSED = [ typeFilter: 7, }], foundElems: 1, - original: "fn:foo", returned: [], userQuery: "fn:foo", error: null, @@ -26,7 +25,6 @@ const PARSED = [ typeFilter: 6, }], foundElems: 1, - original: "enum : foo", returned: [], userQuery: "enum : foo", error: null, @@ -35,7 +33,6 @@ const PARSED = [ query: 'macro:foo', elems: [], foundElems: 0, - original: "macro:foo", returned: [], userQuery: "macro:foo", error: "Unexpected `<` in type filter (before `:`)", @@ -51,7 +48,6 @@ const PARSED = [ typeFilter: 16, }], foundElems: 1, - original: "macro!", returned: [], userQuery: "macro!", error: null, @@ -67,7 +63,6 @@ const PARSED = [ typeFilter: 16, }], foundElems: 1, - original: "macro:mac!", returned: [], userQuery: "macro:mac!", error: null, @@ -83,7 +78,6 @@ const PARSED = [ typeFilter: 16, }], foundElems: 1, - original: "a::mac!", returned: [], userQuery: "a::mac!", error: null, @@ -92,7 +86,6 @@ const PARSED = [ query: '-> fn:foo', elems: [], foundElems: 1, - original: "-> fn:foo", returned: [{ name: "foo", fullPath: ["foo"], @@ -108,7 +101,6 @@ const PARSED = [ query: '-> fn:foo', elems: [], foundElems: 1, - original: "-> fn:foo", returned: [{ name: "foo", fullPath: ["foo"], @@ -133,7 +125,6 @@ const PARSED = [ query: '-> fn:foo', elems: [], foundElems: 1, - original: "-> fn:foo", returned: [{ name: "foo", fullPath: ["foo"], diff --git a/tests/rustdoc-js-std/parser-generics.js b/tests/rustdoc-js-std/parser-generics.js index 726ee56c2c1ba..8cf7868e1a34b 100644 --- a/tests/rustdoc-js-std/parser-generics.js +++ b/tests/rustdoc-js-std/parser-generics.js @@ -3,9 +3,8 @@ const PARSED = [ query: 'A, E>', elems: [], foundElems: 0, - original: 'A, E>', + userQuery: 'A, E>', returned: [], - userQuery: 'a, e>', error: 'Unclosed `<`', }, { @@ -29,7 +28,6 @@ const PARSED = [ }, ], foundElems: 2, - original: "p<>,u8", returned: [], userQuery: "p<>,u8", error: null, @@ -55,7 +53,6 @@ const PARSED = [ }, ], foundElems: 1, - original: '"p"', returned: [], userQuery: '"p"', error: null, @@ -89,7 +86,6 @@ const PARSED = [ }, ], foundElems: 1, - original: 'p>', returned: [], userQuery: 'p>', error: null, @@ -130,7 +126,6 @@ const PARSED = [ }, ], foundElems: 1, - original: 'p, r>', returned: [], userQuery: 'p, r>', error: null, @@ -171,7 +166,6 @@ const PARSED = [ }, ], foundElems: 1, - original: 'p>', returned: [], userQuery: 'p>', error: null, diff --git a/tests/rustdoc-js-std/parser-hof.js b/tests/rustdoc-js-std/parser-hof.js index 0b99c45b7a922..130c891e05418 100644 --- a/tests/rustdoc-js-std/parser-hof.js +++ b/tests/rustdoc-js-std/parser-hof.js @@ -12,13 +12,13 @@ const PARSED = [ [ "output", [{ - name: "f", + name: "F", fullPath: ["f"], pathWithoutLast: [], pathLast: "f", generics: [ { - name: "p", + name: "P", fullPath: ["p"], pathWithoutLast: [], pathLast: "p", @@ -32,9 +32,8 @@ const PARSED = [ typeFilter: -1, }], foundElems: 1, - original: "(-> F

)", + userQuery: "(-> F

)", returned: [], - userQuery: "(-> f

)", error: null, }, { @@ -49,7 +48,7 @@ const PARSED = [ [ "output", [{ - name: "p", + name: "P", fullPath: ["p"], pathWithoutLast: [], pathLast: "p", @@ -61,9 +60,8 @@ const PARSED = [ typeFilter: -1, }], foundElems: 1, - original: "(-> P)", + userQuery: "(-> P)", returned: [], - userQuery: "(-> p)", error: null, }, { @@ -90,7 +88,6 @@ const PARSED = [ typeFilter: -1, }], foundElems: 1, - original: "(->,a)", returned: [], userQuery: "(->,a)", error: null, @@ -103,13 +100,13 @@ const PARSED = [ pathWithoutLast: [], pathLast: "->", generics: [{ - name: "f", + name: "F", fullPath: ["f"], pathWithoutLast: [], pathLast: "f", generics: [ { - name: "p", + name: "P", fullPath: ["p"], pathWithoutLast: [], pathLast: "p", @@ -127,9 +124,8 @@ const PARSED = [ typeFilter: -1, }], foundElems: 1, - original: "(F

->)", + userQuery: "(F

->)", returned: [], - userQuery: "(f

->)", error: null, }, { @@ -140,7 +136,7 @@ const PARSED = [ pathWithoutLast: [], pathLast: "->", generics: [{ - name: "p", + name: "P", fullPath: ["p"], pathWithoutLast: [], pathLast: "p", @@ -156,9 +152,8 @@ const PARSED = [ typeFilter: -1, }], foundElems: 1, - original: "(P ->)", + userQuery: "(P ->)", returned: [], - userQuery: "(p ->)", error: null, }, { @@ -185,7 +180,6 @@ const PARSED = [ typeFilter: -1, }], foundElems: 1, - original: "(,a->)", returned: [], userQuery: "(,a->)", error: null, @@ -221,7 +215,6 @@ const PARSED = [ typeFilter: -1, }], foundElems: 1, - original: "(aaaaa->a)", returned: [], userQuery: "(aaaaa->a)", error: null, @@ -267,7 +260,6 @@ const PARSED = [ typeFilter: -1, }], foundElems: 1, - original: "(aaaaa, b -> a)", returned: [], userQuery: "(aaaaa, b -> a)", error: null, @@ -313,7 +305,6 @@ const PARSED = [ typeFilter: 1, }], foundElems: 1, - original: "primitive:(aaaaa, b -> a)", returned: [], userQuery: "primitive:(aaaaa, b -> a)", error: null, @@ -369,7 +360,6 @@ const PARSED = [ } ], foundElems: 2, - original: "x, trait:(aaaaa, b -> a)", returned: [], userQuery: "x, trait:(aaaaa, b -> a)", error: null, @@ -378,7 +368,7 @@ const PARSED = [ { query: "Fn () -> F

", elems: [{ - name: "fn", + name: "Fn", fullPath: ["fn"], pathWithoutLast: [], pathLast: "fn", @@ -387,13 +377,13 @@ const PARSED = [ [ "output", [{ - name: "f", + name: "F", fullPath: ["f"], pathWithoutLast: [], pathLast: "f", generics: [ { - name: "p", + name: "P", fullPath: ["p"], pathWithoutLast: [], pathLast: "p", @@ -407,15 +397,14 @@ const PARSED = [ typeFilter: -1, }], foundElems: 1, - original: "Fn () -> F

", + userQuery: "Fn () -> F

", returned: [], - userQuery: "fn () -> f

", error: null, }, { query: "FnMut() -> P", elems: [{ - name: "fnmut", + name: "FnMut", fullPath: ["fnmut"], pathWithoutLast: [], pathLast: "fnmut", @@ -424,7 +413,7 @@ const PARSED = [ [ "output", [{ - name: "p", + name: "P", fullPath: ["p"], pathWithoutLast: [], pathLast: "p", @@ -436,15 +425,14 @@ const PARSED = [ typeFilter: -1, }], foundElems: 1, - original: "FnMut() -> P", + userQuery: "FnMut() -> P", returned: [], - userQuery: "fnmut() -> p", error: null, }, { query: "(FnMut() -> P)", elems: [{ - name: "fnmut", + name: "FnMut", fullPath: ["fnmut"], pathWithoutLast: [], pathLast: "fnmut", @@ -453,7 +441,7 @@ const PARSED = [ [ "output", [{ - name: "p", + name: "P", fullPath: ["p"], pathWithoutLast: [], pathLast: "p", @@ -465,26 +453,25 @@ const PARSED = [ typeFilter: -1, }], foundElems: 1, - original: "(FnMut() -> P)", + userQuery: "(FnMut() -> P)", returned: [], - userQuery: "(fnmut() -> p)", error: null, }, { query: "Fn(F

)", elems: [{ - name: "fn", + name: "Fn", fullPath: ["fn"], pathWithoutLast: [], pathLast: "fn", generics: [{ - name: "f", + name: "F", fullPath: ["f"], pathWithoutLast: [], pathLast: "f", generics: [ { - name: "p", + name: "P", fullPath: ["p"], pathWithoutLast: [], pathLast: "p", @@ -502,9 +489,8 @@ const PARSED = [ typeFilter: -1, }], foundElems: 1, - original: "Fn(F

)", + userQuery: "Fn(F

)", returned: [], - userQuery: "fn(f

)", error: null, }, { @@ -548,7 +534,6 @@ const PARSED = [ typeFilter: 1, }], foundElems: 1, - original: "primitive:fnonce(aaaaa, b) -> a", returned: [], userQuery: "primitive:fnonce(aaaaa, b) -> a", error: null, @@ -594,7 +579,6 @@ const PARSED = [ typeFilter: 1, }], foundElems: 1, - original: "primitive:fnonce(aaaaa, keyword:b) -> trait:a", returned: [], userQuery: "primitive:fnonce(aaaaa, keyword:b) -> trait:a", error: null, @@ -665,7 +649,6 @@ const PARSED = [ } ], foundElems: 2, - original: "x, trait:fn(aaaaa, b -> a)", returned: [], userQuery: "x, trait:fn(aaaaa, b -> a)", error: null, @@ -704,7 +687,6 @@ const PARSED = [ } ], foundElems: 2, - original: "a,b(c)", returned: [], userQuery: "a,b(c)", error: null, diff --git a/tests/rustdoc-js-std/parser-ident.js b/tests/rustdoc-js-std/parser-ident.js index cc79c58f1da3a..cd5c3bfa0b856 100644 --- a/tests/rustdoc-js-std/parser-ident.js +++ b/tests/rustdoc-js-std/parser-ident.js @@ -2,7 +2,7 @@ const PARSED = [ { query: "R", elems: [{ - name: "r", + name: "R", fullPath: ["r"], pathWithoutLast: [], pathLast: "r", @@ -19,9 +19,8 @@ const PARSED = [ typeFilter: -1, }], foundElems: 1, - original: "R", + userQuery: "R", returned: [], - userQuery: "r", error: null, }, { @@ -35,7 +34,6 @@ const PARSED = [ typeFilter: 1, }], foundElems: 1, - original: "!", returned: [], userQuery: "!", error: null, @@ -51,7 +49,6 @@ const PARSED = [ typeFilter: 16, }], foundElems: 1, - original: "a!", returned: [], userQuery: "a!", error: null, @@ -60,7 +57,6 @@ const PARSED = [ query: "a!::b", elems: [], foundElems: 0, - original: "a!::b", returned: [], userQuery: "a!::b", error: "Cannot have associated items in macros", @@ -69,9 +65,8 @@ const PARSED = [ query: "!", elems: [], foundElems: 0, - original: "!", returned: [], - userQuery: "!", + userQuery: "!", error: "Never type `!` does not accept generic parameters", }, { @@ -85,7 +80,6 @@ const PARSED = [ typeFilter: -1, }], foundElems: 1, - original: "!::b", returned: [], userQuery: "!::b", error: null, @@ -94,7 +88,6 @@ const PARSED = [ query: "b::!", elems: [], foundElems: 0, - original: "b::!", returned: [], userQuery: "b::!", error: "Never type `!` is not associated item", @@ -103,7 +96,6 @@ const PARSED = [ query: "!::!", elems: [], foundElems: 0, - original: "!::!", returned: [], userQuery: "!::!", error: "Never type `!` is not associated item", @@ -112,7 +104,6 @@ const PARSED = [ query: "b::!::c", elems: [], foundElems: 0, - original: "b::!::c", returned: [], userQuery: "b::!::c", error: "Never type `!` is not associated item", @@ -126,7 +117,7 @@ const PARSED = [ pathLast: "b", generics: [ { - name: "t", + name: "T", fullPath: ["t"], pathWithoutLast: [], pathLast: "t", @@ -137,16 +128,14 @@ const PARSED = [ typeFilter: -1, }], foundElems: 1, - original: "!::b", returned: [], - userQuery: "!::b", + userQuery: "!::b", error: null, }, { query: "a!::b!", elems: [], foundElems: 0, - original: "a!::b!", returned: [], userQuery: "a!::b!", error: "Cannot have associated items in macros", diff --git a/tests/rustdoc-js-std/parser-literal.js b/tests/rustdoc-js-std/parser-literal.js index 87c06224dbf2d..63e07a246a13d 100644 --- a/tests/rustdoc-js-std/parser-literal.js +++ b/tests/rustdoc-js-std/parser-literal.js @@ -2,13 +2,13 @@ const PARSED = [ { query: 'R

', elems: [{ - name: "r", + name: "R", fullPath: ["r"], pathWithoutLast: [], pathLast: "r", generics: [ { - name: "p", + name: "P", fullPath: ["p"], pathWithoutLast: [], pathLast: "p", @@ -18,9 +18,8 @@ const PARSED = [ typeFilter: -1, }], foundElems: 1, - original: "R

", + userQuery: "R

", returned: [], - userQuery: "r

", error: null, } ]; diff --git a/tests/rustdoc-js-std/parser-paths.js b/tests/rustdoc-js-std/parser-paths.js index 774e5d028cc2c..bb34e22e518a4 100644 --- a/tests/rustdoc-js-std/parser-paths.js +++ b/tests/rustdoc-js-std/parser-paths.js @@ -2,7 +2,7 @@ const PARSED = [ { query: 'A::B', elems: [{ - name: "a::b", + name: "A::B", fullPath: ["a", "b"], pathWithoutLast: ["a"], pathLast: "b", @@ -10,9 +10,8 @@ const PARSED = [ typeFilter: -1, }], foundElems: 1, - original: "A::B", + userQuery: "A::B", returned: [], - userQuery: "a::b", error: null, }, { @@ -26,9 +25,8 @@ const PARSED = [ typeFilter: -1, }], foundElems: 1, - original: 'a:: a', - returned: [], userQuery: 'a:: a', + returned: [], error: null, }, { @@ -42,9 +40,8 @@ const PARSED = [ typeFilter: -1, }], foundElems: 1, - original: 'a ::a', - returned: [], userQuery: 'a ::a', + returned: [], error: null, }, { @@ -58,16 +55,15 @@ const PARSED = [ typeFilter: -1, }], foundElems: 1, - original: 'a :: a', - returned: [], userQuery: 'a :: a', + returned: [], error: null, }, { query: 'A::B,C', elems: [ { - name: "a::b", + name: "A::B", fullPath: ["a", "b"], pathWithoutLast: ["a"], pathLast: "b", @@ -75,7 +71,7 @@ const PARSED = [ typeFilter: -1, }, { - name: "c", + name: "C", fullPath: ["c"], pathWithoutLast: [], pathLast: "c", @@ -84,16 +80,15 @@ const PARSED = [ }, ], foundElems: 2, - original: 'A::B,C', + userQuery: 'A::B,C', returned: [], - userQuery: 'a::b,c', error: null, }, { query: 'A::B,C', elems: [ { - name: "a::b", + name: "A::B", fullPath: ["a", "b"], pathWithoutLast: ["a"], pathLast: "b", @@ -109,7 +104,7 @@ const PARSED = [ typeFilter: -1, }, { - name: "c", + name: "C", fullPath: ["c"], pathWithoutLast: [], pathLast: "c", @@ -118,9 +113,8 @@ const PARSED = [ }, ], foundElems: 2, - original: 'A::B,C', + userQuery: 'A::B,C', returned: [], - userQuery: 'a::b,c', error: null, }, { @@ -134,9 +128,8 @@ const PARSED = [ typeFilter: -1, }], foundElems: 1, - original: "mod::a", - returned: [], userQuery: "mod::a", + returned: [], error: null, }, ]; diff --git a/tests/rustdoc-js-std/parser-quote.js b/tests/rustdoc-js-std/parser-quote.js index 731673cf4633c..87ad51074d0f4 100644 --- a/tests/rustdoc-js-std/parser-quote.js +++ b/tests/rustdoc-js-std/parser-quote.js @@ -3,7 +3,6 @@ const PARSED = [ query: '-> "p"', elems: [], foundElems: 1, - original: '-> "p"', returned: [{ name: "p", fullPath: ["p"], @@ -26,7 +25,6 @@ const PARSED = [ typeFilter: -1, }], foundElems: 1, - original: '"p",', returned: [], userQuery: '"p",', error: null, @@ -35,7 +33,6 @@ const PARSED = [ query: '"p" -> a', elems: [], foundElems: 0, - original: '"p" -> a', returned: [], userQuery: '"p" -> a', error: "Cannot have more than one element if you use quotes", @@ -44,7 +41,6 @@ const PARSED = [ query: '"a" -> "p"', elems: [], foundElems: 0, - original: '"a" -> "p"', returned: [], userQuery: '"a" -> "p"', error: "Cannot have more than one literal search element", @@ -53,7 +49,6 @@ const PARSED = [ query: '->"-"', elems: [], foundElems: 0, - original: '->"-"', returned: [], userQuery: '->"-"', error: 'Unexpected `-` in a string element', @@ -62,7 +57,6 @@ const PARSED = [ query: '"a', elems: [], foundElems: 0, - original: '"a', returned: [], userQuery: '"a', error: 'Unclosed `"`', @@ -71,7 +65,6 @@ const PARSED = [ query: '""', elems: [], foundElems: 0, - original: '""', returned: [], userQuery: '""', error: 'Cannot have empty string element', diff --git a/tests/rustdoc-js-std/parser-reference.js b/tests/rustdoc-js-std/parser-reference.js index 6b1250146bef8..0fa07ae989528 100644 --- a/tests/rustdoc-js-std/parser-reference.js +++ b/tests/rustdoc-js-std/parser-reference.js @@ -3,18 +3,16 @@ const PARSED = [ query: '&[', elems: [], foundElems: 0, - original: '&[', - returned: [], userQuery: '&[', + returned: [], error: 'Unclosed `[`', }, { query: '[&', elems: [], foundElems: 0, - original: '[&', - returned: [], userQuery: '[&', + returned: [], error: 'Unclosed `[`', }, { @@ -39,7 +37,7 @@ const PARSED = [ pathLast: "reference", generics: [ { - name: "d", + name: "D", fullPath: ["d"], pathWithoutLast: [], pathLast: "d", @@ -65,9 +63,8 @@ const PARSED = [ }, ], foundElems: 2, - original: '&&&D, []', + userQuery: '&&&D, []', returned: [], - userQuery: '&&&d, []', error: null, }, { @@ -98,7 +95,7 @@ const PARSED = [ pathLast: "[]", generics: [ { - name: "d", + name: "D", fullPath: ["d"], pathWithoutLast: [], pathLast: "d", @@ -119,9 +116,8 @@ const PARSED = [ }, ], foundElems: 1, - original: '&&&[D]', + userQuery: '&&&[D]', returned: [], - userQuery: '&&&[d]', error: null, }, { @@ -137,9 +133,8 @@ const PARSED = [ }, ], foundElems: 1, - original: '&', - returned: [], userQuery: '&', + returned: [], error: null, }, { @@ -164,9 +159,8 @@ const PARSED = [ }, ], foundElems: 1, - original: '&mut', - returned: [], userQuery: '&mut', + returned: [], error: null, }, { @@ -190,9 +184,8 @@ const PARSED = [ }, ], foundElems: 2, - original: "&,u8", - returned: [], userQuery: "&,u8", + returned: [], error: null, }, { @@ -225,9 +218,8 @@ const PARSED = [ }, ], foundElems: 2, - original: "&mut,u8", - returned: [], userQuery: "&mut,u8", + returned: [], error: null, }, { @@ -252,9 +244,8 @@ const PARSED = [ }, ], foundElems: 1, - original: "&u8", - returned: [], userQuery: "&u8", + returned: [], error: null, }, { @@ -288,9 +279,8 @@ const PARSED = [ }, ], foundElems: 1, - original: "&u8", - returned: [], userQuery: "&u8", + returned: [], error: null, }, { @@ -324,9 +314,8 @@ const PARSED = [ }, ], foundElems: 1, - original: "u8<&u8>", - returned: [], userQuery: "u8<&u8>", + returned: [], error: null, }, { @@ -368,9 +357,8 @@ const PARSED = [ }, ], foundElems: 1, - original: "u8<&u8, u8>", - returned: [], userQuery: "u8<&u8, u8>", + returned: [], error: null, }, { @@ -404,9 +392,8 @@ const PARSED = [ }, ], foundElems: 1, - original: "u8<&u8>", - returned: [], userQuery: "u8<&u8>", + returned: [], error: null, }, { @@ -456,9 +443,8 @@ const PARSED = [ }, ], foundElems: 1, - original: "u8<&mut u8, u8>", - returned: [], userQuery: "u8<&mut u8, u8>", + returned: [], error: null, }, { @@ -483,18 +469,16 @@ const PARSED = [ }, ], foundElems: 1, - original: "primitive:&u8", - returned: [], userQuery: "primitive:&u8", + returned: [], error: null, }, { query: 'macro:&u8', elems: [], foundElems: 0, - original: "macro:&u8", - returned: [], userQuery: "macro:&u8", + returned: [], error: "Invalid search type: primitive `&` and `macro` both specified", }, { @@ -519,9 +503,8 @@ const PARSED = [ }, ], foundElems: 1, - original: "¯o:u8", - returned: [], userQuery: "¯o:u8", + returned: [], error: null, }, ]; diff --git a/tests/rustdoc-js-std/parser-returned.js b/tests/rustdoc-js-std/parser-returned.js index 44e517c49b59c..79aefcdf15c21 100644 --- a/tests/rustdoc-js-std/parser-returned.js +++ b/tests/rustdoc-js-std/parser-returned.js @@ -3,15 +3,15 @@ const PARSED = [ query: "-> F

", elems: [], foundElems: 1, - original: "-> F

", + userQuery: "-> F

", returned: [{ - name: "f", + name: "F", fullPath: ["f"], pathWithoutLast: [], pathLast: "f", generics: [ { - name: "p", + name: "P", fullPath: ["p"], pathWithoutLast: [], pathLast: "p", @@ -20,30 +20,27 @@ const PARSED = [ ], typeFilter: -1, }], - userQuery: "-> f

", error: null, }, { query: "-> P", elems: [], foundElems: 1, - original: "-> P", + userQuery: "-> P", returned: [{ - name: "p", + name: "P", fullPath: ["p"], pathWithoutLast: [], pathLast: "p", generics: [], typeFilter: -1, }], - userQuery: "-> p", error: null, }, { query: "->,a", elems: [], foundElems: 1, - original: "->,a", returned: [{ name: "a", fullPath: ["a"], @@ -66,7 +63,6 @@ const PARSED = [ typeFilter: -1, }], foundElems: 2, - original: "aaaaa->a", returned: [{ name: "a", fullPath: ["a"], @@ -82,7 +78,6 @@ const PARSED = [ query: "-> !", elems: [], foundElems: 1, - original: "-> !", returned: [{ name: "never", fullPath: ["never"], diff --git a/tests/rustdoc-js-std/parser-separators.js b/tests/rustdoc-js-std/parser-separators.js index 7f95f61b006bb..66b069bcd0ccf 100644 --- a/tests/rustdoc-js-std/parser-separators.js +++ b/tests/rustdoc-js-std/parser-separators.js @@ -14,7 +14,6 @@ const PARSED = [ }, ], foundElems: 1, - original: "aaaaaa b", returned: [], userQuery: "aaaaaa b", error: null, @@ -40,7 +39,6 @@ const PARSED = [ }, ], foundElems: 2, - original: "aaaaaa, b", returned: [], userQuery: "aaaaaa, b", error: null, @@ -58,7 +56,6 @@ const PARSED = [ }, ], foundElems: 1, - original: "a b", returned: [], userQuery: "a b", error: null, @@ -84,7 +81,6 @@ const PARSED = [ }, ], foundElems: 2, - original: "a,b", returned: [], userQuery: "a,b", error: null, @@ -102,7 +98,6 @@ const PARSED = [ }, ], foundElems: 1, - original: "a b", returned: [], userQuery: "a b", error: null, @@ -128,7 +123,6 @@ const PARSED = [ }, ], foundElems: 1, - original: "a", returned: [], userQuery: "a", error: null, @@ -161,7 +155,6 @@ const PARSED = [ }, ], foundElems: 1, - original: "a", returned: [], userQuery: "a", error: null, @@ -187,7 +180,6 @@ const PARSED = [ }, ], foundElems: 1, - original: "a", returned: [], userQuery: "a", error: null, diff --git a/tests/rustdoc-js-std/parser-slice-array.js b/tests/rustdoc-js-std/parser-slice-array.js index 1de52af94e6b0..6579794553599 100644 --- a/tests/rustdoc-js-std/parser-slice-array.js +++ b/tests/rustdoc-js-std/parser-slice-array.js @@ -3,9 +3,8 @@ const PARSED = [ query: '[[[D, []]]', elems: [], foundElems: 0, - original: '[[[D, []]]', + userQuery: '[[[D, []]]', returned: [], - userQuery: '[[[d, []]]', error: 'Unclosed `[`', }, { @@ -30,7 +29,7 @@ const PARSED = [ pathLast: "[]", generics: [ { - name: "d", + name: "D", fullPath: ["d"], pathWithoutLast: [], pathLast: "d", @@ -56,9 +55,8 @@ const PARSED = [ }, ], foundElems: 1, - original: '[[[D, []]]]', + userQuery: '[[[D, []]]]', returned: [], - userQuery: '[[[d, []]]]', error: null, }, { @@ -82,9 +80,8 @@ const PARSED = [ }, ], foundElems: 2, - original: "[],u8", - returned: [], userQuery: "[],u8", + returned: [], error: null, }, { @@ -109,9 +106,8 @@ const PARSED = [ }, ], foundElems: 1, - original: "[u8]", - returned: [], userQuery: "[u8]", + returned: [], error: null, }, { @@ -144,9 +140,8 @@ const PARSED = [ }, ], foundElems: 1, - original: "[u8,u8]", - returned: [], userQuery: "[u8,u8]", + returned: [], error: null, }, { @@ -180,9 +175,8 @@ const PARSED = [ }, ], foundElems: 1, - original: "[u8]", - returned: [], userQuery: "[u8]", + returned: [], error: null, }, { @@ -198,90 +192,80 @@ const PARSED = [ }, ], foundElems: 1, - original: "[]", - returned: [], userQuery: "[]", + returned: [], error: null, }, { query: '[>', elems: [], foundElems: 0, - original: "[>", - returned: [], userQuery: "[>", + returned: [], error: "Unexpected `>` after `[`", }, { query: '[<', elems: [], foundElems: 0, - original: "[<", - returned: [], userQuery: "[<", + returned: [], error: "Found generics without a path", }, { query: '[a>', elems: [], foundElems: 0, - original: "[a>", - returned: [], userQuery: "[a>", + returned: [], error: "Unexpected `>` after `[`", }, { query: '[a<', elems: [], foundElems: 0, - original: "[a<", - returned: [], userQuery: "[a<", + returned: [], error: "Unclosed `<`", }, { query: '[a', elems: [], foundElems: 0, - original: "[a", - returned: [], userQuery: "[a", + returned: [], error: "Unclosed `[`", }, { query: '[', elems: [], foundElems: 0, - original: "[", - returned: [], userQuery: "[", + returned: [], error: "Unclosed `[`", }, { query: ']', elems: [], foundElems: 0, - original: "]", - returned: [], userQuery: "]", + returned: [], error: "Unexpected `]`", }, { query: '[a', elems: [], foundElems: 0, - original: "[a", - returned: [], userQuery: "[a", + returned: [], error: "Unclosed `[`", }, { query: 'a]', elems: [], foundElems: 0, - original: "a]", - returned: [], userQuery: "a]", + returned: [], error: "Unexpected `]` after `>`", }, { @@ -306,18 +290,16 @@ const PARSED = [ }, ], foundElems: 1, - original: "primitive:[u8]", - returned: [], userQuery: "primitive:[u8]", + returned: [], error: null, }, { query: 'macro:[u8]', elems: [], foundElems: 0, - original: "macro:[u8]", - returned: [], userQuery: "macro:[u8]", + returned: [], error: "Invalid search type: primitive `[]` and `macro` both specified", }, ]; diff --git a/tests/rustdoc-js-std/parser-tuple.js b/tests/rustdoc-js-std/parser-tuple.js index eb16289d3c055..6192506838708 100644 --- a/tests/rustdoc-js-std/parser-tuple.js +++ b/tests/rustdoc-js-std/parser-tuple.js @@ -3,9 +3,8 @@ const PARSED = [ query: '(((D, ()))', elems: [], foundElems: 0, - original: '(((D, ()))', + userQuery: '(((D, ()))', returned: [], - userQuery: '(((d, ()))', error: 'Unclosed `(`', }, { @@ -18,7 +17,7 @@ const PARSED = [ pathLast: "()", generics: [ { - name: "d", + name: "D", fullPath: ["d"], pathWithoutLast: [], pathLast: "d", @@ -38,9 +37,8 @@ const PARSED = [ } ], foundElems: 1, - original: '(((D, ())))', + userQuery: '(((D, ())))', returned: [], - userQuery: '(((d, ())))', error: null, }, { @@ -64,9 +62,8 @@ const PARSED = [ }, ], foundElems: 2, - original: "(),u8", - returned: [], userQuery: "(),u8", + returned: [], error: null, }, // Parens act as grouping operators when: @@ -88,9 +85,8 @@ const PARSED = [ }, ], foundElems: 1, - original: "(u8)", - returned: [], userQuery: "(u8)", + returned: [], error: null, }, { @@ -115,9 +111,8 @@ const PARSED = [ }, ], foundElems: 1, - original: "(u8,)", - returned: [], userQuery: "(u8,)", + returned: [], error: null, }, { @@ -142,9 +137,8 @@ const PARSED = [ }, ], foundElems: 1, - original: "(,u8)", - returned: [], userQuery: "(,u8)", + returned: [], error: null, }, { @@ -169,9 +163,8 @@ const PARSED = [ }, ], foundElems: 1, - original: "primitive:(u8)", - returned: [], userQuery: "primitive:(u8)", + returned: [], error: null, }, { @@ -187,9 +180,8 @@ const PARSED = [ }, ], foundElems: 1, - original: "(primitive:u8)", - returned: [], userQuery: "(primitive:u8)", + returned: [], error: null, }, { @@ -222,9 +214,8 @@ const PARSED = [ }, ], foundElems: 1, - original: "(u8,u8)", - returned: [], userQuery: "(u8,u8)", + returned: [], error: null, }, { @@ -249,9 +240,8 @@ const PARSED = [ }, ], foundElems: 1, - original: "(u8)", - returned: [], userQuery: "(u8)", + returned: [], error: null, }, { @@ -267,99 +257,88 @@ const PARSED = [ }, ], foundElems: 1, - original: "()", - returned: [], userQuery: "()", + returned: [], error: null, }, { query: '(>', elems: [], foundElems: 0, - original: "(>", - returned: [], userQuery: "(>", + returned: [], error: "Unexpected `>` after `(`", }, { query: '(<', elems: [], foundElems: 0, - original: "(<", - returned: [], userQuery: "(<", + returned: [], error: "Found generics without a path", }, { query: '(a>', elems: [], foundElems: 0, - original: "(a>", - returned: [], userQuery: "(a>", + returned: [], error: "Unexpected `>` after `(`", }, { query: '(a<', elems: [], foundElems: 0, - original: "(a<", - returned: [], userQuery: "(a<", + returned: [], error: "Unclosed `<`", }, { query: '(a', elems: [], foundElems: 0, - original: "(a", - returned: [], userQuery: "(a", + returned: [], error: "Unclosed `(`", }, { query: '(', elems: [], foundElems: 0, - original: "(", - returned: [], userQuery: "(", + returned: [], error: "Unclosed `(`", }, { query: ')', elems: [], foundElems: 0, - original: ")", - returned: [], userQuery: ")", + returned: [], error: "Unexpected `)`", }, { query: '(a', elems: [], foundElems: 0, - original: "(a", - returned: [], userQuery: "(a", + returned: [], error: "Unclosed `(`", }, { query: 'a)', elems: [], foundElems: 0, - original: "a)", - returned: [], userQuery: "a)", + returned: [], error: "Unexpected `)` after `>`", }, { query: 'macro:(u8)', elems: [], foundElems: 0, - original: "macro:(u8)", - returned: [], userQuery: "macro:(u8)", + returned: [], error: "Invalid search type: primitive `()` and `macro` both specified", }, ]; diff --git a/tests/rustdoc-js-std/parser-weird-queries.js b/tests/rustdoc-js-std/parser-weird-queries.js index 499b82a346948..828b0a7d9f66a 100644 --- a/tests/rustdoc-js-std/parser-weird-queries.js +++ b/tests/rustdoc-js-std/parser-weird-queries.js @@ -15,9 +15,8 @@ const PARSED = [ }, ], foundElems: 1, - original: "a b", - returned: [], userQuery: "a b", + returned: [], error: null, }, { @@ -32,9 +31,8 @@ const PARSED = [ }, ], foundElems: 1, - original: "a b", - returned: [], userQuery: "a b", + returned: [], error: null, }, { @@ -56,36 +54,32 @@ const PARSED = [ }, ], foundElems: 2, - original: "aaa,a", - returned: [], userQuery: "aaa,a", + returned: [], error: null, }, { query: ',,,,', elems: [], foundElems: 0, - original: ",,,,", - returned: [], userQuery: ",,,,", + returned: [], error: null, }, { query: 'mod :', elems: [], foundElems: 0, - original: 'mod :', - returned: [], userQuery: 'mod :', + returned: [], error: "Unexpected `:` (expected path after type filter `mod:`)", }, { query: 'mod\t:', elems: [], foundElems: 0, - original: 'mod :', - returned: [], userQuery: 'mod :', + returned: [], error: "Unexpected `:` (expected path after type filter `mod:`)", }, ]; diff --git a/tests/rustdoc-js/type-parameters.js b/tests/rustdoc-js/type-parameters.js index e045409e507e5..7dd330911ff33 100644 --- a/tests/rustdoc-js/type-parameters.js +++ b/tests/rustdoc-js/type-parameters.js @@ -74,6 +74,13 @@ const EXPECTED = [ }, { query: 'Other', + in_args: [ + { path: 'foo', name: 'alternate' }, + { path: 'foo', name: 'other' }, + ], + }, + { + query: 'other', in_args: [ // because function is called "other", it's sorted first // even though it has higher type distance