From 64d98f8ee037282c35007b64c2649055c56af1db Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:19:03 +0200 Subject: Merging upstream version 1.68.2+dfsg1. Signed-off-by: Daniel Baumann --- src/test/rustdoc-js-std/alias-1.js | 7 - src/test/rustdoc-js-std/alias-2.js | 10 - src/test/rustdoc-js-std/alias-3.js | 7 - src/test/rustdoc-js-std/alias-4.js | 7 - src/test/rustdoc-js-std/alias.js | 11 - src/test/rustdoc-js-std/asrawfd.js | 14 - src/test/rustdoc-js-std/basic.js | 15 - src/test/rustdoc-js-std/deduplication.js | 11 - src/test/rustdoc-js-std/enum-option.js | 7 - src/test/rustdoc-js-std/filter-crate.js | 9 - src/test/rustdoc-js-std/fn-forget.js | 8 - src/test/rustdoc-js-std/from_u.js | 9 - src/test/rustdoc-js-std/keyword.js | 10 - src/test/rustdoc-js-std/macro-check.js | 10 - src/test/rustdoc-js-std/macro-print.js | 10 - src/test/rustdoc-js-std/never.js | 7 - src/test/rustdoc-js-std/parser-errors.js | 385 --------------------- src/test/rustdoc-js-std/parser-filter.js | 43 --- src/test/rustdoc-js-std/parser-generics.js | 62 ---- src/test/rustdoc-js-std/parser-ident.js | 93 ----- src/test/rustdoc-js-std/parser-literal.js | 27 -- src/test/rustdoc-js-std/parser-paths.js | 90 ----- src/test/rustdoc-js-std/parser-quote.js | 87 ----- src/test/rustdoc-js-std/parser-returned.js | 99 ------ src/test/rustdoc-js-std/parser-separators.js | 206 ----------- src/test/rustdoc-js-std/parser-weird-queries.js | 123 ------- src/test/rustdoc-js-std/path-ordering.js | 12 - src/test/rustdoc-js-std/primitive.js | 75 ---- src/test/rustdoc-js-std/quoted.js | 21 -- src/test/rustdoc-js-std/return-specific-literal.js | 10 - src/test/rustdoc-js-std/return-specific.js | 10 - src/test/rustdoc-js-std/should-fail.js | 9 - src/test/rustdoc-js-std/string-from_ut.js | 11 - src/test/rustdoc-js-std/struct-vec.js | 8 - src/test/rustdoc-js-std/typed-query.js | 17 - src/test/rustdoc-js-std/vec-new.js | 9 - 36 files changed, 1549 deletions(-) delete mode 100644 src/test/rustdoc-js-std/alias-1.js delete mode 100644 src/test/rustdoc-js-std/alias-2.js delete mode 100644 src/test/rustdoc-js-std/alias-3.js delete mode 100644 src/test/rustdoc-js-std/alias-4.js delete mode 100644 src/test/rustdoc-js-std/alias.js delete mode 100644 src/test/rustdoc-js-std/asrawfd.js delete mode 100644 src/test/rustdoc-js-std/basic.js delete mode 100644 src/test/rustdoc-js-std/deduplication.js delete mode 100644 src/test/rustdoc-js-std/enum-option.js delete mode 100644 src/test/rustdoc-js-std/filter-crate.js delete mode 100644 src/test/rustdoc-js-std/fn-forget.js delete mode 100644 src/test/rustdoc-js-std/from_u.js delete mode 100644 src/test/rustdoc-js-std/keyword.js delete mode 100644 src/test/rustdoc-js-std/macro-check.js delete mode 100644 src/test/rustdoc-js-std/macro-print.js delete mode 100644 src/test/rustdoc-js-std/never.js delete mode 100644 src/test/rustdoc-js-std/parser-errors.js delete mode 100644 src/test/rustdoc-js-std/parser-filter.js delete mode 100644 src/test/rustdoc-js-std/parser-generics.js delete mode 100644 src/test/rustdoc-js-std/parser-ident.js delete mode 100644 src/test/rustdoc-js-std/parser-literal.js delete mode 100644 src/test/rustdoc-js-std/parser-paths.js delete mode 100644 src/test/rustdoc-js-std/parser-quote.js delete mode 100644 src/test/rustdoc-js-std/parser-returned.js delete mode 100644 src/test/rustdoc-js-std/parser-separators.js delete mode 100644 src/test/rustdoc-js-std/parser-weird-queries.js delete mode 100644 src/test/rustdoc-js-std/path-ordering.js delete mode 100644 src/test/rustdoc-js-std/primitive.js delete mode 100644 src/test/rustdoc-js-std/quoted.js delete mode 100644 src/test/rustdoc-js-std/return-specific-literal.js delete mode 100644 src/test/rustdoc-js-std/return-specific.js delete mode 100644 src/test/rustdoc-js-std/should-fail.js delete mode 100644 src/test/rustdoc-js-std/string-from_ut.js delete mode 100644 src/test/rustdoc-js-std/struct-vec.js delete mode 100644 src/test/rustdoc-js-std/typed-query.js delete mode 100644 src/test/rustdoc-js-std/vec-new.js (limited to 'src/test/rustdoc-js-std') diff --git a/src/test/rustdoc-js-std/alias-1.js b/src/test/rustdoc-js-std/alias-1.js deleted file mode 100644 index 7c6327fcd..000000000 --- a/src/test/rustdoc-js-std/alias-1.js +++ /dev/null @@ -1,7 +0,0 @@ -const QUERY = '&'; - -const EXPECTED = { - 'others': [ - { 'path': 'std', 'name': 'reference' }, - ], -}; diff --git a/src/test/rustdoc-js-std/alias-2.js b/src/test/rustdoc-js-std/alias-2.js deleted file mode 100644 index 798fa29ef..000000000 --- a/src/test/rustdoc-js-std/alias-2.js +++ /dev/null @@ -1,10 +0,0 @@ -const QUERY = '+'; - -const EXPECTED = { - 'others': [ - { 'path': 'std::ops', 'name': 'AddAssign' }, - { 'path': 'std::ops', 'name': 'Add' }, - { 'path': 'core::ops', 'name': 'AddAssign' }, - { 'path': 'core::ops', 'name': 'Add' }, - ], -}; diff --git a/src/test/rustdoc-js-std/alias-3.js b/src/test/rustdoc-js-std/alias-3.js deleted file mode 100644 index 392b1e818..000000000 --- a/src/test/rustdoc-js-std/alias-3.js +++ /dev/null @@ -1,7 +0,0 @@ -const QUERY = '!'; - -const EXPECTED = { - 'others': [ - { 'path': 'std', 'name': 'never' }, - ], -}; diff --git a/src/test/rustdoc-js-std/alias-4.js b/src/test/rustdoc-js-std/alias-4.js deleted file mode 100644 index bf2bb4d29..000000000 --- a/src/test/rustdoc-js-std/alias-4.js +++ /dev/null @@ -1,7 +0,0 @@ -const QUERY = '<'; - -const EXPECTED = { - 'others': [ - { 'name': 'Ord' }, - ], -}; diff --git a/src/test/rustdoc-js-std/alias.js b/src/test/rustdoc-js-std/alias.js deleted file mode 100644 index 2b709c991..000000000 --- a/src/test/rustdoc-js-std/alias.js +++ /dev/null @@ -1,11 +0,0 @@ -// ignore-order - -const QUERY = '['; - -const EXPECTED = { - 'others': [ - { 'path': 'std', 'name': 'slice' }, - { 'path': 'std::ops', 'name': 'IndexMut' }, - { 'path': 'std::ops', 'name': 'Index' }, - ], -}; diff --git a/src/test/rustdoc-js-std/asrawfd.js b/src/test/rustdoc-js-std/asrawfd.js deleted file mode 100644 index 369a34f9c..000000000 --- a/src/test/rustdoc-js-std/asrawfd.js +++ /dev/null @@ -1,14 +0,0 @@ -// ignore-order - -const QUERY = 'RawFd::as_raw_fd'; - -const EXPECTED = { - 'others': [ - // Reproduction test for https://github.com/rust-lang/rust/issues/78724 - // Validate that type alias methods get the correct path. - { 'path': 'std::os::fd::AsRawFd', 'name': 'as_raw_fd' }, - { 'path': 'std::os::fd::AsRawFd', 'name': 'as_raw_fd' }, - { 'path': 'std::os::linux::process::PidFd', 'name': 'as_raw_fd' }, - { 'path': 'std::os::fd::RawFd', 'name': 'as_raw_fd' }, - ], -}; diff --git a/src/test/rustdoc-js-std/basic.js b/src/test/rustdoc-js-std/basic.js deleted file mode 100644 index 824cac710..000000000 --- a/src/test/rustdoc-js-std/basic.js +++ /dev/null @@ -1,15 +0,0 @@ -const QUERY = 'String'; - -const EXPECTED = { - 'others': [ - { 'path': 'std::string', 'name': 'String' }, - { 'path': 'std::ffi', 'name': 'CString' }, - { 'path': 'std::ffi', 'name': 'OsString' }, - ], - 'in_args': [ - { 'path': 'std::str', 'name': 'eq' }, - ], - 'returned': [ - { 'path': 'std::string::String', 'name': 'add' }, - ], -}; diff --git a/src/test/rustdoc-js-std/deduplication.js b/src/test/rustdoc-js-std/deduplication.js deleted file mode 100644 index f02f6cf55..000000000 --- a/src/test/rustdoc-js-std/deduplication.js +++ /dev/null @@ -1,11 +0,0 @@ -// ignore-order - -const QUERY = 'is_nan'; - -const EXPECTED = { - 'others': [ - { 'path': 'std::f32', 'name': 'is_nan' }, - { 'path': 'std::f64', 'name': 'is_nan' }, - { 'path': 'std::option::Option', 'name': 'is_none' }, - ], -}; diff --git a/src/test/rustdoc-js-std/enum-option.js b/src/test/rustdoc-js-std/enum-option.js deleted file mode 100644 index 902e09069..000000000 --- a/src/test/rustdoc-js-std/enum-option.js +++ /dev/null @@ -1,7 +0,0 @@ -const QUERY = 'enum:Option'; - -const EXPECTED = { - 'others': [ - { 'path': 'std::option', 'name': 'Option' }, - ], -}; diff --git a/src/test/rustdoc-js-std/filter-crate.js b/src/test/rustdoc-js-std/filter-crate.js deleted file mode 100644 index b47a1fefa..000000000 --- a/src/test/rustdoc-js-std/filter-crate.js +++ /dev/null @@ -1,9 +0,0 @@ -// exact-check - -const QUERY = '"hashmap"'; -const FILTER_CRATE = 'core'; - -const EXPECTED = { - 'others': [ - ], -}; diff --git a/src/test/rustdoc-js-std/fn-forget.js b/src/test/rustdoc-js-std/fn-forget.js deleted file mode 100644 index 66a5fcaa7..000000000 --- a/src/test/rustdoc-js-std/fn-forget.js +++ /dev/null @@ -1,8 +0,0 @@ -const QUERY = 'fn:forget'; - -const EXPECTED = { - 'others': [ - { 'path': 'std::mem', 'name': 'forget' }, - { 'path': 'std::fmt', 'name': 'format' }, - ], -}; diff --git a/src/test/rustdoc-js-std/from_u.js b/src/test/rustdoc-js-std/from_u.js deleted file mode 100644 index e3f3cd436..000000000 --- a/src/test/rustdoc-js-std/from_u.js +++ /dev/null @@ -1,9 +0,0 @@ -const QUERY = 'from_u'; - -const EXPECTED = { - 'others': [ - { 'path': 'std::char', 'name': 'from_u32' }, - { 'path': 'std::str', 'name': 'from_utf8' }, - { 'path': 'std::string::String', 'name': 'from_utf8' }, - ], -}; diff --git a/src/test/rustdoc-js-std/keyword.js b/src/test/rustdoc-js-std/keyword.js deleted file mode 100644 index 868ddd7b6..000000000 --- a/src/test/rustdoc-js-std/keyword.js +++ /dev/null @@ -1,10 +0,0 @@ -// ignore-order - -const QUERY = 'fn'; - -const EXPECTED = { - 'others': [ - { 'path': 'std', 'name': 'fn', ty: 15 }, // 15 is for primitive types - { 'path': 'std', 'name': 'fn', ty: 21 }, // 21 is for keywords - ], -}; diff --git a/src/test/rustdoc-js-std/macro-check.js b/src/test/rustdoc-js-std/macro-check.js deleted file mode 100644 index 242e0cbf5..000000000 --- a/src/test/rustdoc-js-std/macro-check.js +++ /dev/null @@ -1,10 +0,0 @@ -// ignore-order - -const QUERY = 'panic'; - -const EXPECTED = { - 'others': [ - { 'path': 'std', 'name': 'panic', ty: 14 }, // 15 is for macros - { 'path': 'std', 'name': 'panic', ty: 0 }, // 0 is for modules - ], -}; diff --git a/src/test/rustdoc-js-std/macro-print.js b/src/test/rustdoc-js-std/macro-print.js deleted file mode 100644 index 858046e72..000000000 --- a/src/test/rustdoc-js-std/macro-print.js +++ /dev/null @@ -1,10 +0,0 @@ -const QUERY = 'macro:print'; - -const EXPECTED = { - 'others': [ - { 'path': 'std', 'name': 'print' }, - { 'path': 'std', 'name': 'eprint' }, - { 'path': 'std', 'name': 'println' }, - { 'path': 'std', 'name': 'eprintln' }, - ], -}; diff --git a/src/test/rustdoc-js-std/never.js b/src/test/rustdoc-js-std/never.js deleted file mode 100644 index 392b1e818..000000000 --- a/src/test/rustdoc-js-std/never.js +++ /dev/null @@ -1,7 +0,0 @@ -const QUERY = '!'; - -const EXPECTED = { - 'others': [ - { 'path': 'std', 'name': 'never' }, - ], -}; diff --git a/src/test/rustdoc-js-std/parser-errors.js b/src/test/rustdoc-js-std/parser-errors.js deleted file mode 100644 index dc42031e0..000000000 --- a/src/test/rustdoc-js-std/parser-errors.js +++ /dev/null @@ -1,385 +0,0 @@ -const QUERY = [ - '

', - '->

', - 'a<"P">', - '"P" "P"', - 'P "P"', - '"p" p', - '"const": p', - "a<:a>", - "a<::a>", - "((a))", - "(p -> p", - "::a::b", - "a::::b", - "a::b::", - ":a", - "a b:", - "a (b:", - "_:", - "a-bb", - "a>bb", - "ab'", - "a->", - '"p" ', - '"p" a', - "a,<", - "aaaaa<>b", - "fn:aaaaa<>b", - "->a<>b", - "a<->", - "a:: a", - "a ::a", - "a:", - "a<>:", - "a,:", - " a<> :", - "mod : :", - "a!a", - "a!!", -]; - -const PARSED = [ - { - elems: [], - foundElems: 0, - original: "

", - returned: [], - typeFilter: -1, - userQuery: "

", - error: "Found generics without a path", - }, - { - elems: [], - foundElems: 0, - original: "->

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

", - error: "Found generics without a path", - }, - { - elems: [], - foundElems: 0, - original: "a<\"P\">", - returned: [], - typeFilter: -1, - userQuery: "a<\"p\">", - error: "`\"` cannot be used in generics", - }, - { - elems: [], - foundElems: 0, - original: "\"P\" \"P\"", - returned: [], - typeFilter: -1, - userQuery: "\"p\" \"p\"", - error: "Cannot have more than one literal search element", - }, - { - elems: [], - foundElems: 0, - original: "P \"P\"", - returned: [], - typeFilter: -1, - userQuery: "p \"p\"", - error: "Cannot use literal search when there is more than one element", - }, - { - elems: [], - foundElems: 0, - original: "\"p\" p", - returned: [], - typeFilter: -1, - userQuery: "\"p\" p", - error: "You cannot have more than one element if you use quotes", - }, - { - elems: [], - foundElems: 0, - original: "\"const\": p", - returned: [], - typeFilter: -1, - userQuery: "\"const\": p", - error: "You cannot use quotes on type filter", - }, - { - elems: [], - foundElems: 0, - original: "a<:a>", - returned: [], - typeFilter: -1, - userQuery: "a<:a>", - error: "Unexpected `:` after `<`", - }, - { - elems: [], - foundElems: 0, - original: "a<::a>", - returned: [], - typeFilter: -1, - userQuery: "a<::a>", - error: "Unexpected `::`: paths cannot start with `::`", - }, - { - elems: [], - foundElems: 0, - original: "((a))", - returned: [], - typeFilter: -1, - userQuery: "((a))", - error: "Unexpected `(`", - }, - { - elems: [], - foundElems: 0, - original: "(p -> p", - returned: [], - typeFilter: -1, - userQuery: "(p -> p", - error: "Unexpected `(`", - }, - { - elems: [], - foundElems: 0, - original: "::a::b", - returned: [], - typeFilter: -1, - userQuery: "::a::b", - error: "Paths cannot start with `::`", - }, - { - elems: [], - foundElems: 0, - original: "a::::b", - returned: [], - typeFilter: -1, - userQuery: "a::::b", - error: "Unexpected `::::`", - }, - { - elems: [], - foundElems: 0, - original: "a::b::", - returned: [], - typeFilter: -1, - userQuery: "a::b::", - error: "Paths cannot end with `::`", - }, - { - elems: [], - foundElems: 0, - original: ":a", - returned: [], - typeFilter: -1, - userQuery: ":a", - error: "Expected type filter before `:`", - }, - { - elems: [], - foundElems: 0, - original: "a b:", - returned: [], - typeFilter: -1, - userQuery: "a b:", - error: "Unexpected `:`", - }, - { - elems: [], - foundElems: 0, - original: "a (b:", - returned: [], - typeFilter: -1, - userQuery: "a (b:", - error: "Unexpected `(`", - }, - { - elems: [], - foundElems: 0, - original: "_:", - returned: [], - typeFilter: -1, - userQuery: "_:", - error: "Unknown type filter `_`", - }, - { - elems: [], - foundElems: 0, - original: "a-bb", - returned: [], - typeFilter: -1, - userQuery: "a-bb", - error: "Unexpected `-` (did you mean `->`?)", - }, - { - elems: [], - foundElems: 0, - original: "a>bb", - returned: [], - typeFilter: -1, - userQuery: "a>bb", - error: "Unexpected `>` (did you mean `->`?)", - }, - { - elems: [], - foundElems: 0, - original: "ab'", - returned: [], - typeFilter: -1, - userQuery: "ab'", - error: "Unexpected `'`", - }, - { - elems: [], - foundElems: 0, - original: "a->", - returned: [], - typeFilter: -1, - userQuery: "a->", - error: "Expected at least one item after `->`", - }, - { - elems: [], - foundElems: 0, - original: '"p" ', - returned: [], - typeFilter: -1, - userQuery: '"p" ', - error: "Found generics without a path", - }, - { - elems: [], - foundElems: 0, - original: '"p" a', - returned: [], - typeFilter: -1, - userQuery: '"p" a', - error: "You cannot have more than one element if you use quotes", - }, - { - elems: [], - foundElems: 0, - original: 'a,<', - returned: [], - typeFilter: -1, - userQuery: 'a,<', - error: 'Found generics without a path', - }, - { - elems: [], - foundElems: 0, - original: 'aaaaa<>b', - returned: [], - typeFilter: -1, - userQuery: 'aaaaa<>b', - error: 'Expected `,`, ` `, `:` or `->`, found `b`', - }, - { - elems: [], - foundElems: 0, - original: 'fn:aaaaa<>b', - returned: [], - typeFilter: -1, - userQuery: 'fn:aaaaa<>b', - error: 'Expected `,`, ` ` or `->`, found `b`', - }, - { - elems: [], - foundElems: 0, - original: '->a<>b', - returned: [], - typeFilter: -1, - userQuery: '->a<>b', - error: 'Expected `,` or ` `, found `b`', - }, - { - elems: [], - foundElems: 0, - original: 'a<->', - returned: [], - typeFilter: -1, - userQuery: 'a<->', - error: 'Unexpected `-` after `<`', - }, - { - elems: [], - foundElems: 0, - original: 'a:: a', - returned: [], - typeFilter: -1, - userQuery: 'a:: a', - error: 'Paths cannot end with `::`', - }, - { - elems: [], - foundElems: 0, - original: 'a ::a', - returned: [], - typeFilter: -1, - userQuery: 'a ::a', - error: 'Paths cannot start with `::`', - }, - { - elems: [], - foundElems: 0, - original: "a:", - returned: [], - typeFilter: -1, - userQuery: "a:", - error: 'Unexpected `:`', - }, - { - elems: [], - foundElems: 0, - original: "a<>:", - returned: [], - typeFilter: -1, - userQuery: "a<>:", - error: 'Unexpected `<` in type filter', - }, - { - elems: [], - foundElems: 0, - original: "a,:", - returned: [], - typeFilter: -1, - userQuery: "a,:", - error: 'Unexpected `,` in type filter', - }, - { - elems: [], - foundElems: 0, - original: "a<> :", - returned: [], - typeFilter: -1, - userQuery: "a<> :", - error: 'Unexpected `<` in type filter', - }, - { - elems: [], - foundElems: 0, - original: "mod : :", - returned: [], - typeFilter: -1, - userQuery: "mod : :", - error: 'Unexpected `:`', - }, - { - elems: [], - foundElems: 0, - original: "a!a", - returned: [], - typeFilter: -1, - userQuery: "a!a", - error: '`!` can only be at the end of an ident', - }, - { - elems: [], - foundElems: 0, - original: "a!!", - returned: [], - typeFilter: -1, - userQuery: "a!!", - error: 'Cannot have more than one `!` in an ident', - }, -]; diff --git a/src/test/rustdoc-js-std/parser-filter.js b/src/test/rustdoc-js-std/parser-filter.js deleted file mode 100644 index e5a87a415..000000000 --- a/src/test/rustdoc-js-std/parser-filter.js +++ /dev/null @@ -1,43 +0,0 @@ -const QUERY = ['fn:foo', 'enum : foo', 'macro:foo']; - -const PARSED = [ - { - elems: [{ - name: "foo", - fullPath: ["foo"], - pathWithoutLast: [], - pathLast: "foo", - generics: [], - }], - foundElems: 1, - original: "fn:foo", - returned: [], - typeFilter: 5, - userQuery: "fn:foo", - error: null, - }, - { - elems: [{ - name: "foo", - fullPath: ["foo"], - pathWithoutLast: [], - pathLast: "foo", - generics: [], - }], - foundElems: 1, - original: "enum : foo", - returned: [], - typeFilter: 4, - userQuery: "enum : foo", - error: null, - }, - { - elems: [], - foundElems: 0, - original: "macro:foo", - returned: [], - typeFilter: -1, - userQuery: "macro:foo", - error: "Unexpected `:`", - }, -]; diff --git a/src/test/rustdoc-js-std/parser-generics.js b/src/test/rustdoc-js-std/parser-generics.js deleted file mode 100644 index 0cf7f5019..000000000 --- a/src/test/rustdoc-js-std/parser-generics.js +++ /dev/null @@ -1,62 +0,0 @@ -const QUERY = ['A, E>', 'p<> u8', '"p"']; - -const PARSED = [ - { - elems: [], - foundElems: 0, - original: 'A, E>', - returned: [], - typeFilter: -1, - userQuery: 'a, e>', - error: 'Unexpected `<` after `<`', - }, - { - elems: [ - { - name: "p", - fullPath: ["p"], - pathWithoutLast: [], - pathLast: "p", - generics: [], - }, - { - name: "u8", - fullPath: ["u8"], - pathWithoutLast: [], - pathLast: "u8", - generics: [], - }, - ], - foundElems: 2, - original: "p<> u8", - returned: [], - typeFilter: -1, - userQuery: "p<> u8", - error: null, - }, - { - elems: [ - { - name: "p", - fullPath: ["p"], - pathWithoutLast: [], - pathLast: "p", - generics: [ - { - name: "a", - fullPath: ["a"], - pathWithoutLast: [], - pathLast: "a", - generics: [], - }, - ], - }, - ], - foundElems: 1, - original: '"p"', - returned: [], - typeFilter: -1, - userQuery: '"p"', - error: null, - }, -]; diff --git a/src/test/rustdoc-js-std/parser-ident.js b/src/test/rustdoc-js-std/parser-ident.js deleted file mode 100644 index 4b5ab01ac..000000000 --- a/src/test/rustdoc-js-std/parser-ident.js +++ /dev/null @@ -1,93 +0,0 @@ -const QUERY = [ - "R", - "!", - "a!", - "a!::b", - "a!::b!", -]; - -const PARSED = [ - { - elems: [{ - name: "r", - fullPath: ["r"], - pathWithoutLast: [], - pathLast: "r", - generics: [ - { - name: "!", - fullPath: ["!"], - pathWithoutLast: [], - pathLast: "!", - generics: [], - }, - ], - }], - foundElems: 1, - original: "R", - returned: [], - typeFilter: -1, - userQuery: "r", - error: null, - }, - { - elems: [{ - name: "!", - fullPath: ["!"], - pathWithoutLast: [], - pathLast: "!", - generics: [], - }], - foundElems: 1, - original: "!", - returned: [], - typeFilter: -1, - userQuery: "!", - error: null, - }, - { - elems: [{ - name: "a!", - fullPath: ["a!"], - pathWithoutLast: [], - pathLast: "a!", - generics: [], - }], - foundElems: 1, - original: "a!", - returned: [], - typeFilter: -1, - userQuery: "a!", - error: null, - }, - { - elems: [{ - name: "a!::b", - fullPath: ["a!", "b"], - pathWithoutLast: ["a!"], - pathLast: "b", - generics: [], - }], - foundElems: 1, - original: "a!::b", - returned: [], - typeFilter: -1, - userQuery: "a!::b", - error: null, - }, - { - elems: [{ - name: "a!::b!", - fullPath: ["a!", "b!"], - pathWithoutLast: ["a!"], - pathLast: "b!", - generics: [], - }], - foundElems: 1, - original: "a!::b!", - returned: [], - typeFilter: -1, - userQuery: "a!::b!", - error: null, - }, -]; diff --git a/src/test/rustdoc-js-std/parser-literal.js b/src/test/rustdoc-js-std/parser-literal.js deleted file mode 100644 index 87b3baff1..000000000 --- a/src/test/rustdoc-js-std/parser-literal.js +++ /dev/null @@ -1,27 +0,0 @@ -const QUERY = ['R

']; - -const PARSED = [ - { - elems: [{ - name: "r", - fullPath: ["r"], - pathWithoutLast: [], - pathLast: "r", - generics: [ - { - name: "p", - fullPath: ["p"], - pathWithoutLast: [], - pathLast: "p", - generics: [], - }, - ], - }], - foundElems: 1, - original: "R

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

", - error: null, - } -]; diff --git a/src/test/rustdoc-js-std/parser-paths.js b/src/test/rustdoc-js-std/parser-paths.js deleted file mode 100644 index 9f823f933..000000000 --- a/src/test/rustdoc-js-std/parser-paths.js +++ /dev/null @@ -1,90 +0,0 @@ -const QUERY = ['A::B', 'A::B,C', 'A::B,C', 'mod::a']; - -const PARSED = [ - { - elems: [{ - name: "a::b", - fullPath: ["a", "b"], - pathWithoutLast: ["a"], - pathLast: "b", - generics: [], - }], - foundElems: 1, - original: "A::B", - returned: [], - typeFilter: -1, - userQuery: "a::b", - error: null, - }, - { - elems: [ - { - name: "a::b", - fullPath: ["a", "b"], - pathWithoutLast: ["a"], - pathLast: "b", - generics: [], - }, - { - name: "c", - fullPath: ["c"], - pathWithoutLast: [], - pathLast: "c", - generics: [], - }, - ], - foundElems: 2, - original: 'A::B,C', - returned: [], - typeFilter: -1, - userQuery: 'a::b,c', - error: null, - }, - { - elems: [ - { - name: "a::b", - fullPath: ["a", "b"], - pathWithoutLast: ["a"], - pathLast: "b", - generics: [ - { - name: "f", - fullPath: ["f"], - pathWithoutLast: [], - pathLast: "f", - generics: [], - }, - ], - }, - { - name: "c", - fullPath: ["c"], - pathWithoutLast: [], - pathLast: "c", - generics: [], - }, - ], - foundElems: 2, - original: 'A::B,C', - returned: [], - typeFilter: -1, - userQuery: 'a::b,c', - error: null, - }, - { - elems: [{ - name: "mod::a", - fullPath: ["mod", "a"], - pathWithoutLast: ["mod"], - pathLast: "a", - generics: [], - }], - foundElems: 1, - original: "mod::a", - returned: [], - typeFilter: -1, - userQuery: "mod::a", - error: null, - }, -]; diff --git a/src/test/rustdoc-js-std/parser-quote.js b/src/test/rustdoc-js-std/parser-quote.js deleted file mode 100644 index 1e16c90de..000000000 --- a/src/test/rustdoc-js-std/parser-quote.js +++ /dev/null @@ -1,87 +0,0 @@ -const QUERY = [ - '-> "p"', - '"p",', - '"p" -> a', - '"a" -> "p"', - '->"-"', - '"a', - '""', -]; - -const PARSED = [ - { - elems: [], - foundElems: 1, - original: '-> "p"', - returned: [{ - name: "p", - fullPath: ["p"], - pathWithoutLast: [], - pathLast: "p", - generics: [], - }], - typeFilter: -1, - userQuery: '-> "p"', - error: null, - }, - { - elems: [{ - name: "p", - fullPath: ["p"], - pathWithoutLast: [], - pathLast: "p", - generics: [], - }], - foundElems: 1, - original: '"p",', - returned: [], - typeFilter: -1, - userQuery: '"p",', - error: null, - }, - { - elems: [], - foundElems: 0, - original: '"p" -> a', - returned: [], - typeFilter: -1, - userQuery: '"p" -> a', - error: "You cannot have more than one element if you use quotes", - }, - { - elems: [], - foundElems: 0, - original: '"a" -> "p"', - returned: [], - typeFilter: -1, - userQuery: '"a" -> "p"', - error: "Cannot have more than one literal search element", - }, - { - elems: [], - foundElems: 0, - original: '->"-"', - returned: [], - typeFilter: -1, - userQuery: '->"-"', - error: 'Unexpected `-` in a string element', - }, - { - elems: [], - foundElems: 0, - original: '"a', - returned: [], - typeFilter: -1, - userQuery: '"a', - error: 'Unclosed `"`', - }, - { - elems: [], - foundElems: 0, - original: '""', - returned: [], - typeFilter: -1, - userQuery: '""', - error: 'Cannot have empty string element', - }, -]; diff --git a/src/test/rustdoc-js-std/parser-returned.js b/src/test/rustdoc-js-std/parser-returned.js deleted file mode 100644 index 6fce17dca..000000000 --- a/src/test/rustdoc-js-std/parser-returned.js +++ /dev/null @@ -1,99 +0,0 @@ -const QUERY = [ - "-> F

", - "-> P", - "->,a", - "aaaaa->a", - "-> !", -]; - -const PARSED = [ - { - elems: [], - foundElems: 1, - original: "-> F

", - returned: [{ - name: "f", - fullPath: ["f"], - pathWithoutLast: [], - pathLast: "f", - generics: [ - { - name: "p", - fullPath: ["p"], - pathWithoutLast: [], - pathLast: "p", - generics: [], - }, - ], - }], - typeFilter: -1, - userQuery: "-> f

", - error: null, - }, - { - elems: [], - foundElems: 1, - original: "-> P", - returned: [{ - name: "p", - fullPath: ["p"], - pathWithoutLast: [], - pathLast: "p", - generics: [], - }], - typeFilter: -1, - userQuery: "-> p", - error: null, - }, - { - elems: [], - foundElems: 1, - original: "->,a", - returned: [{ - name: "a", - fullPath: ["a"], - pathWithoutLast: [], - pathLast: "a", - generics: [], - }], - typeFilter: -1, - userQuery: "->,a", - error: null, - }, - { - elems: [{ - name: "aaaaa", - fullPath: ["aaaaa"], - pathWithoutLast: [], - pathLast: "aaaaa", - generics: [], - }], - foundElems: 2, - original: "aaaaa->a", - returned: [{ - name: "a", - fullPath: ["a"], - pathWithoutLast: [], - pathLast: "a", - generics: [], - }], - typeFilter: -1, - userQuery: "aaaaa->a", - error: null, - }, - { - elems: [], - foundElems: 1, - original: "-> !", - returned: [{ - name: "!", - fullPath: ["!"], - pathWithoutLast: [], - pathLast: "!", - generics: [], - }], - typeFilter: -1, - userQuery: "-> !", - error: null, - }, -]; diff --git a/src/test/rustdoc-js-std/parser-separators.js b/src/test/rustdoc-js-std/parser-separators.js deleted file mode 100644 index 5b7abdfa8..000000000 --- a/src/test/rustdoc-js-std/parser-separators.js +++ /dev/null @@ -1,206 +0,0 @@ -// ignore-tidy-tab - -const QUERY = [ - 'aaaaaa b', - 'a b', - 'a,b', - 'a\tb', - 'a', - 'a', - 'a', -]; - -const PARSED = [ - { - elems: [ - { - name: 'aaaaaa', - fullPath: ['aaaaaa'], - pathWithoutLast: [], - pathLast: 'aaaaaa', - generics: [], - }, - { - name: 'b', - fullPath: ['b'], - pathWithoutLast: [], - pathLast: 'b', - generics: [], - }, - ], - foundElems: 2, - original: "aaaaaa b", - returned: [], - typeFilter: -1, - userQuery: "aaaaaa b", - error: null, - }, - { - elems: [ - { - name: 'a', - fullPath: ['a'], - pathWithoutLast: [], - pathLast: 'a', - generics: [], - }, - { - name: 'b', - fullPath: ['b'], - pathWithoutLast: [], - pathLast: 'b', - generics: [], - }, - ], - foundElems: 2, - original: "a b", - returned: [], - typeFilter: -1, - userQuery: "a b", - error: null, - }, - { - elems: [ - { - name: 'a', - fullPath: ['a'], - pathWithoutLast: [], - pathLast: 'a', - generics: [], - }, - { - name: 'b', - fullPath: ['b'], - pathWithoutLast: [], - pathLast: 'b', - generics: [], - }, - ], - foundElems: 2, - original: "a,b", - returned: [], - typeFilter: -1, - userQuery: "a,b", - error: null, - }, - { - elems: [ - { - name: 'a', - fullPath: ['a'], - pathWithoutLast: [], - pathLast: 'a', - generics: [], - }, - { - name: 'b', - fullPath: ['b'], - pathWithoutLast: [], - pathLast: 'b', - generics: [], - }, - ], - foundElems: 2, - original: "a\tb", - returned: [], - typeFilter: -1, - userQuery: "a\tb", - error: null, - }, - { - elems: [ - { - name: 'a', - fullPath: ['a'], - pathWithoutLast: [], - pathLast: 'a', - generics: [ - { - name: 'b', - fullPath: ['b'], - pathWithoutLast: [], - pathLast: 'b', - generics: [], - }, - { - name: 'c', - fullPath: ['c'], - pathWithoutLast: [], - pathLast: 'c', - generics: [], - }, - ], - }, - ], - foundElems: 1, - original: "a", - returned: [], - typeFilter: -1, - userQuery: "a", - error: null, - }, - { - elems: [ - { - name: 'a', - fullPath: ['a'], - pathWithoutLast: [], - pathLast: 'a', - generics: [ - { - name: 'b', - fullPath: ['b'], - pathWithoutLast: [], - pathLast: 'b', - generics: [], - }, - { - name: 'c', - fullPath: ['c'], - pathWithoutLast: [], - pathLast: 'c', - generics: [], - }, - ], - }, - ], - foundElems: 1, - original: "a", - returned: [], - typeFilter: -1, - userQuery: "a", - error: null, - }, - { - elems: [ - { - name: 'a', - fullPath: ['a'], - pathWithoutLast: [], - pathLast: 'a', - generics: [ - { - name: 'b', - fullPath: ['b'], - pathWithoutLast: [], - pathLast: 'b', - generics: [], - }, - { - name: 'c', - fullPath: ['c'], - pathWithoutLast: [], - pathLast: 'c', - generics: [], - }, - ], - }, - ], - foundElems: 1, - original: "a", - returned: [], - typeFilter: -1, - userQuery: "a", - error: null, - }, -]; diff --git a/src/test/rustdoc-js-std/parser-weird-queries.js b/src/test/rustdoc-js-std/parser-weird-queries.js deleted file mode 100644 index a3d85aeca..000000000 --- a/src/test/rustdoc-js-std/parser-weird-queries.js +++ /dev/null @@ -1,123 +0,0 @@ -// This test is mostly to check that the parser still kinda outputs something -// (and doesn't enter an infinite loop!) even though the query is completely -// invalid. -const QUERY = [ - 'a b', - 'a b', - 'a,b(c)', - 'aaa,a', - ',,,,', - 'mod :', - 'mod\t:', -]; - -const PARSED = [ - { - elems: [ - { - name: "a", - fullPath: ["a"], - pathWithoutLast: [], - pathLast: "a", - generics: [], - }, - { - name: "b", - fullPath: ["b"], - pathWithoutLast: [], - pathLast: "b", - generics: [], - }, - ], - foundElems: 2, - original: "a b", - returned: [], - typeFilter: -1, - userQuery: "a b", - error: null, - }, - { - elems: [ - { - name: "a", - fullPath: ["a"], - pathWithoutLast: [], - pathLast: "a", - generics: [], - }, - { - name: "b", - fullPath: ["b"], - pathWithoutLast: [], - pathLast: "b", - generics: [], - }, - ], - foundElems: 2, - original: "a b", - returned: [], - typeFilter: -1, - userQuery: "a b", - error: null, - }, - { - elems: [], - foundElems: 0, - original: "a,b(c)", - returned: [], - typeFilter: -1, - userQuery: "a,b(c)", - error: "Unexpected `(`", - }, - { - elems: [ - { - name: "aaa", - fullPath: ["aaa"], - pathWithoutLast: [], - pathLast: "aaa", - generics: [], - }, - { - name: "a", - fullPath: ["a"], - pathWithoutLast: [], - pathLast: "a", - generics: [], - }, - ], - foundElems: 2, - original: "aaa,a", - returned: [], - typeFilter: -1, - userQuery: "aaa,a", - error: null, - }, - { - elems: [], - foundElems: 0, - original: ",,,,", - returned: [], - typeFilter: -1, - userQuery: ",,,,", - error: null, - }, - { - elems: [], - foundElems: 0, - original: 'mod :', - returned: [], - typeFilter: 0, - userQuery: 'mod :', - error: null, - }, - { - elems: [], - foundElems: 0, - original: 'mod\t:', - returned: [], - typeFilter: 0, - userQuery: 'mod\t:', - error: null, - }, -]; diff --git a/src/test/rustdoc-js-std/path-ordering.js b/src/test/rustdoc-js-std/path-ordering.js deleted file mode 100644 index 7dcdd4023..000000000 --- a/src/test/rustdoc-js-std/path-ordering.js +++ /dev/null @@ -1,12 +0,0 @@ -const QUERY = 'hashset::insert'; - -const EXPECTED = { - 'others': [ - // ensure hashset::insert comes first - { 'path': 'std::collections::hash_set::HashSet', 'name': 'insert' }, - { 'path': 'std::collections::hash_set::HashSet', 'name': 'get_or_insert' }, - { 'path': 'std::collections::hash_set::HashSet', 'name': 'get_or_insert_with' }, - { 'path': 'std::collections::hash_set::HashSet', 'name': 'get_or_insert_owned' }, - { 'path': 'std::collections::hash_map::HashMap', 'name': 'insert' }, - ], -}; diff --git a/src/test/rustdoc-js-std/primitive.js b/src/test/rustdoc-js-std/primitive.js deleted file mode 100644 index e5690383e..000000000 --- a/src/test/rustdoc-js-std/primitive.js +++ /dev/null @@ -1,75 +0,0 @@ -const QUERY = [ - 'i8', - 'u32', - 'str', - 'char', - 'unit', - 'tuple', - 'fn', -]; - -const EXPECTED = [ - { - 'others': [ - { - 'path': 'std', - 'name': 'i8', - 'href': '../std/primitive.i8.html', - }, - ] - }, - { - 'others': [ - { - 'path': 'std', - 'name': 'u32', - 'href': '../std/primitive.u32.html', - }, - ] - }, - { - 'others': [ - { - 'path': 'std', - 'name': 'str', - 'href': '../std/primitive.str.html', - }, - ] - }, - { - 'others': [ - { - 'path': 'std', - 'name': 'char', - 'href': '../std/primitive.char.html', - }, - ] - }, - { - 'others': [ - { - 'path': 'std', - 'name': 'unit', - 'href': '../std/primitive.unit.html', - }, - ] - }, - { - 'others': [ - { - 'path': 'std', - 'name': 'tuple', - 'href': '../std/primitive.tuple.html', - }, - ] - }, - { - 'others': [ - { - 'path': 'std', - 'name': 'fn', - 'href': '../std/primitive.fn.html', - }, - ] - }, -]; diff --git a/src/test/rustdoc-js-std/quoted.js b/src/test/rustdoc-js-std/quoted.js deleted file mode 100644 index aec8484a4..000000000 --- a/src/test/rustdoc-js-std/quoted.js +++ /dev/null @@ -1,21 +0,0 @@ -// ignore-order - -const QUERY = '"error"'; -const FILTER_CRATE = 'std'; - -const EXPECTED = { - 'others': [ - { 'path': 'std', 'name': 'error' }, - { 'path': 'std::fmt', 'name': 'Error' }, - { 'path': 'std::io', 'name': 'Error' }, - ], - 'in_args': [ - { 'path': 'std::fmt::Error', 'name': 'eq' }, - { 'path': 'std::fmt::Error', 'name': 'cmp' }, - { 'path': 'std::fmt::Error', 'name': 'partial_cmp' }, - - ], - 'returned': [ - { 'path': 'std::fmt::LowerExp', 'name': 'fmt' }, - ], -}; diff --git a/src/test/rustdoc-js-std/return-specific-literal.js b/src/test/rustdoc-js-std/return-specific-literal.js deleted file mode 100644 index c7c347240..000000000 --- a/src/test/rustdoc-js-std/return-specific-literal.js +++ /dev/null @@ -1,10 +0,0 @@ -const QUERY = 'struct:"string"'; - -const EXPECTED = { - 'in_args': [ - { 'path': 'std::string::String', 'name': 'ne' }, - ], - 'returned': [ - { 'path': 'std::string::String', 'name': 'add' }, - ], -}; diff --git a/src/test/rustdoc-js-std/return-specific.js b/src/test/rustdoc-js-std/return-specific.js deleted file mode 100644 index d9a910553..000000000 --- a/src/test/rustdoc-js-std/return-specific.js +++ /dev/null @@ -1,10 +0,0 @@ -const QUERY = 'struct:string'; - -const EXPECTED = { - 'in_args': [ - { 'path': 'std::string::String', 'name': 'ne' }, - ], - 'returned': [ - { 'path': 'std::string::String', 'name': 'add' }, - ], -}; diff --git a/src/test/rustdoc-js-std/should-fail.js b/src/test/rustdoc-js-std/should-fail.js deleted file mode 100644 index b85a47dc0..000000000 --- a/src/test/rustdoc-js-std/should-fail.js +++ /dev/null @@ -1,9 +0,0 @@ -// should-fail - -const QUERY = 'fn'; - -const EXPECTED = { - 'others': [ - { 'path': 'std', 'name': 'fn', ty: 14 }, - ], -}; diff --git a/src/test/rustdoc-js-std/string-from_ut.js b/src/test/rustdoc-js-std/string-from_ut.js deleted file mode 100644 index f9edf4408..000000000 --- a/src/test/rustdoc-js-std/string-from_ut.js +++ /dev/null @@ -1,11 +0,0 @@ -const QUERY = 'String::from_ut'; - -const EXPECTED = { - 'others': [ - { 'path': 'std::string::String', 'name': 'from_utf8' }, - { 'path': 'std::string::String', 'name': 'from_utf8' }, - { 'path': 'std::string::String', 'name': 'from_utf8_lossy' }, - { 'path': 'std::string::String', 'name': 'from_utf16_lossy' }, - { 'path': 'std::string::String', 'name': 'from_utf8_unchecked' }, - ], -}; diff --git a/src/test/rustdoc-js-std/struct-vec.js b/src/test/rustdoc-js-std/struct-vec.js deleted file mode 100644 index 29609904b..000000000 --- a/src/test/rustdoc-js-std/struct-vec.js +++ /dev/null @@ -1,8 +0,0 @@ -const QUERY = 'struct:VecD'; - -const EXPECTED = { - 'others': [ - { 'path': 'std::collections', 'name': 'VecDeque' }, - { 'path': 'std::vec', 'name': 'Vec' }, - ], -}; diff --git a/src/test/rustdoc-js-std/typed-query.js b/src/test/rustdoc-js-std/typed-query.js deleted file mode 100644 index 25efbad26..000000000 --- a/src/test/rustdoc-js-std/typed-query.js +++ /dev/null @@ -1,17 +0,0 @@ -// exact-check - -const QUERY = 'macro:print'; -const FILTER_CRATE = 'std'; - -const EXPECTED = { - 'others': [ - { 'path': 'std', 'name': 'print' }, - { 'path': 'std', 'name': 'eprint' }, - { 'path': 'std', 'name': 'println' }, - { 'path': 'std', 'name': 'eprintln' }, - { 'path': 'std::pin', 'name': 'pin' }, - { 'path': 'std::future', 'name': 'join' }, - { 'path': 'std', 'name': 'line' }, - { 'path': 'std', 'name': 'write' }, - ], -}; diff --git a/src/test/rustdoc-js-std/vec-new.js b/src/test/rustdoc-js-std/vec-new.js deleted file mode 100644 index cd0e8e7b4..000000000 --- a/src/test/rustdoc-js-std/vec-new.js +++ /dev/null @@ -1,9 +0,0 @@ -const QUERY = 'Vec::new'; - -const EXPECTED = { - 'others': [ - { 'path': 'std::vec::Vec', 'name': 'new' }, - { 'path': 'std::vec::Vec', 'name': 'ne' }, - { 'path': 'alloc::vec::Vec', 'name': 'ne' }, - ], -}; -- cgit v1.2.3