Rename rustdoc js test suites

21 files changed, 3 insertions, 184 deletions

diff --git a/src/test/rustdoc-js/alias-1.js b/src/test/rustdoc-js/alias-1.js
deleted file mode 100644
index 7c6327fcdd7..00000000000
--- a/src/test/rustdoc-js/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/alias-2.js b/src/test/rustdoc-js/alias-2.js
deleted file mode 100644
index f3c6713692b..00000000000
--- a/src/test/rustdoc-js/alias-2.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// ignore-order
-
-const QUERY = '+';
-
-const EXPECTED = {
-    'others': [
-        { 'path': 'std::ops', 'name': 'AddAssign' },
-        { 'path': 'std::ops', 'name': 'Add' },
-    ],
-};
diff --git a/src/test/rustdoc-js/alias-3.js b/src/test/rustdoc-js/alias-3.js
deleted file mode 100644
index 392b1e81837..00000000000
--- a/src/test/rustdoc-js/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/alias.js b/src/test/rustdoc-js/alias.js
deleted file mode 100644
index 2b709c99119..00000000000
--- a/src/test/rustdoc-js/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/basic.js b/src/test/rustdoc-js/basic.js
index 824cac71083..d99b23468b6 100644
--- a/src/test/rustdoc-js/basic.js
+++ b/src/test/rustdoc-js/basic.js
@@ -1,15 +1,7 @@
-const QUERY = 'String';
+const QUERY = 'Fo';
 
 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' },
+        { 'path': 'basic', 'name': 'Foo' },
     ],
 };
diff --git a/src/test/rustdoc-js/basic.rs b/src/test/rustdoc-js/basic.rs
new file mode 100644
index 00000000000..4a835673a59
--- /dev/null
+++ b/src/test/rustdoc-js/basic.rs
@@ -0,0 +1 @@
+pub struct Foo;
diff --git a/src/test/rustdoc-js/deduplication.js b/src/test/rustdoc-js/deduplication.js
deleted file mode 100644
index f02f6cf55ed..00000000000
--- a/src/test/rustdoc-js/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/enum-option.js b/src/test/rustdoc-js/enum-option.js
deleted file mode 100644
index 902e0906910..00000000000
--- a/src/test/rustdoc-js/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/filter-crate.js b/src/test/rustdoc-js/filter-crate.js
deleted file mode 100644
index 2e0330c4497..00000000000
--- a/src/test/rustdoc-js/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/fn-forget.js b/src/test/rustdoc-js/fn-forget.js
deleted file mode 100644
index 66a5fcaa781..00000000000
--- a/src/test/rustdoc-js/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/from_u.js b/src/test/rustdoc-js/from_u.js
deleted file mode 100644
index e3f3cd436aa..00000000000
--- a/src/test/rustdoc-js/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/keyword.js b/src/test/rustdoc-js/keyword.js
deleted file mode 100644
index 868ddd7b6dc..00000000000
--- a/src/test/rustdoc-js/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/macro-check.js b/src/test/rustdoc-js/macro-check.js
deleted file mode 100644
index 242e0cbf5f4..00000000000
--- a/src/test/rustdoc-js/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/macro-print.js b/src/test/rustdoc-js/macro-print.js
deleted file mode 100644
index 858046e72e9..00000000000
--- a/src/test/rustdoc-js/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/multi-query.js b/src/test/rustdoc-js/multi-query.js
deleted file mode 100644
index 01e54065189..00000000000
--- a/src/test/rustdoc-js/multi-query.js
+++ /dev/null
@@ -1,9 +0,0 @@
-const QUERY = 'str,u8';
-
-const EXPECTED = {
-    'others': [
-        { 'path': 'std', 'name': 'str' },
-        { 'path': 'std', 'name': 'u8' },
-        { 'path': 'std::ffi', 'name': 'CStr' },
-    ],
-};
diff --git a/src/test/rustdoc-js/never.js b/src/test/rustdoc-js/never.js
deleted file mode 100644
index 392b1e81837..00000000000
--- a/src/test/rustdoc-js/never.js
+++ /dev/null
@@ -1,7 +0,0 @@
-const QUERY = '!';
-
-const EXPECTED = {
-    'others': [
-        { 'path': 'std', 'name': 'never' },
-    ],
-};
diff --git a/src/test/rustdoc-js/quoted.js b/src/test/rustdoc-js/quoted.js
deleted file mode 100644
index 924129f86c8..00000000000
--- a/src/test/rustdoc-js/quoted.js
+++ /dev/null
@@ -1,13 +0,0 @@
-const QUERY = '"error"';
-
-const EXPECTED = {
-    'others': [
-        { 'path': 'std', 'name': 'error' },
-        { 'path': 'std::fmt', 'name': 'Error' },
-        { 'path': 'std::io', 'name': 'Error' },
-    ],
-    'in_args': [],
-    'returned': [
-        { 'path': 'std::fmt::LowerExp', 'name': 'fmt' },
-    ],
-};
diff --git a/src/test/rustdoc-js/should-fail.js b/src/test/rustdoc-js/should-fail.js
deleted file mode 100644
index b85a47dc08a..00000000000
--- a/src/test/rustdoc-js/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/string-from_ut.js b/src/test/rustdoc-js/string-from_ut.js
deleted file mode 100644
index f9edf4408db..00000000000
--- a/src/test/rustdoc-js/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/struct-vec.js b/src/test/rustdoc-js/struct-vec.js
deleted file mode 100644
index 2c808143bae..00000000000
--- a/src/test/rustdoc-js/struct-vec.js
+++ /dev/null
@@ -1,8 +0,0 @@
-const QUERY = 'struct:Vec';
-
-const EXPECTED = {
-    'others': [
-        { 'path': 'std::vec', 'name': 'Vec' },
-        { 'path': 'std::collections', 'name': 'VecDeque' },
-    ],
-};
diff --git a/src/test/rustdoc-js/vec-new.js b/src/test/rustdoc-js/vec-new.js
deleted file mode 100644
index e4daa5065d2..00000000000
--- a/src/test/rustdoc-js/vec-new.js
+++ /dev/null
@@ -1,8 +0,0 @@
-const QUERY = 'Vec::new';
-
-const EXPECTED = {
-    'others': [
-        { 'path': 'std::vec::Vec', 'name': 'new' },
-        { 'path': 'std::vec::Vec', 'name': 'ne' },
-    ],
-};