Move type name directly into the same DOM element

2 files changed, 1 insertions, 19 deletions

diff --git a/src/librustdoc/html/static/css/rustdoc.css b/src/librustdoc/html/static/css/rustdoc.css
index 167319ba9bd..b487cfa5c25 100644
--- a/src/librustdoc/html/static/css/rustdoc.css
+++ b/src/librustdoc/html/static/css/rustdoc.css
@@ -190,7 +190,6 @@ h1, h2, h3, h4, h5, h6,
 .mobile-topbar,
 .search-input,
 .search-results .result-name,
-.search-results .type-kind,
 .item-name > a,
 .out-of-band,
 span.since,
@@ -871,10 +870,6 @@ so that we can apply CSS-filters to change the arrow color in themes */
 }
 
 .search-results > a > div {
-	flex: 3;
-}
-
-.search-results > a > div.type-kind {
 	flex: 1;
 }
 
@@ -1722,14 +1717,6 @@ in source-script.js
 		display: block;
 	}
 
-	.search-results > a > .type-kind {
-		display: inline-block;
-	}
-	.search-results > a > .result-name {
-		display: inline-block;
-		margin-left: 7px;
-	}
-
 	/* Display an alternating layout on tablets and phones */
 	.search-results > a {
 		padding: 5px 0px;
diff --git a/src/librustdoc/html/static/js/search.js b/src/librustdoc/html/static/js/search.js
index c25c36994fa..eff8aa79caf 100644
--- a/src/librustdoc/html/static/js/search.js
+++ b/src/librustdoc/html/static/js/search.js
@@ -1892,14 +1892,9 @@ function initSearch(rawSearchIndex) {
                     resultName.appendChild(alias);
                 }
 
-                const typeDisplay = document.createElement("div");
-                typeDisplay.innerText = typeName;
-                typeDisplay.className = "type-kind";
-                link.appendChild(typeDisplay);
-
                 resultName.insertAdjacentHTML(
                     "beforeend",
-                    item.displayPath + "<span class=\"" + type + "\">" + name + "</span>");
+                    `${typeName} ${item.displayPath}<span class="${type}">${name}</span>`);
                 link.appendChild(resultName);
 
                 const description = document.createElement("div");