rustdoc-search: rank re-export lower

Fixes a side effect of 127a5d9 reported
on Zulip.

Author: notriddle

src/librustdoc/html/static/js/search.js

@@ -2884,6 +2884,13 @@ class DocSearch {
                         return a - b;
                     }
 
+                    // sort re-exports lower
+                    a = Number(aai.ty === itemTypes.import);
+                    b = Number(bbi.ty === itemTypes.import);
+                    if (a !== b) {
+                        return a - b;
+                    }
+
                     // sort deprecated items later
                     a = Number(aai.deprecated);
                     b = Number(bbi.deprecated);

tests/rustdoc-js-std/println-typo.js

@@ -8,8 +8,8 @@ const EXPECTED = {
         { 'path': 'std', 'name': 'println' },
         { 'path': 'std::prelude::v1', 'name': 'println' },
         { 'path': 'std', 'name': 'print' },
-        { 'path': 'std::prelude::v1', 'name': 'print' },
         { 'path': 'std', 'name': 'eprintln' },
+        { 'path': 'std::prelude::v1', 'name': 'print' },
         { 'path': 'std::prelude::v1', 'name': 'eprintln' },
     ],
 };

tests/rustdoc-js/auxiliary/zzzzz.rs

@@ -0,0 +1,4 @@
+//@ edition:2021
+
+#![crate_name = "zzzzz"]
+pub struct Eepy;

tests/rustdoc-js/import-crate-preference.js

@@ -0,0 +1,23 @@
+// This test ensures that imports have lower ranking than other matches,
+// even if those matches have shorter names.
+
+const EXPECTED = [
+    {
+        'query': 'Eepy',
+        'others': [
+            { 'path': 'zzzzz', 'name': 'Eepy' },
+        ],
+    },
+    {
+        'query': 'zzzzz::Eepy',
+        'others': [
+            { 'path': 'zzzzz', 'name': 'Eepy' },
+        ],
+    },
+    {
+        'query': 'foo::Eepy',
+        'others': [
+            { 'path': 'foo', 'name': 'Eepy' },
+        ],
+    },
+];

tests/rustdoc-js/import-crate-preference.rs

@@ -0,0 +1,9 @@
+//@ aux-crate:zzzzz=zzzzz.rs
+//@ aux-build:zzzzz.rs
+//@ build-aux-docs
+//@ edition:2021
+
+#![crate_name = "foo"]
+
+#[doc(no_inline)]
+pub use zzzzz::Eepy;

tests/rustdoc-js/reexport-dedup.js

@@ -4,7 +4,7 @@ const EXPECTED = [
     {
         'query': 'Subscriber',
         'others': [
-            { 'path': 'foo', 'name': 'Subscriber' },
+            { 'path': 'foo::fmt', 'name': 'Subscriber' },
         ],
     },
     {