about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlexis Beingessner <a.beingessner@gmail.com>2014-08-09 09:20:44 -0400
committerAlexis Beingessner <a.beingessner@gmail.com>2014-08-09 15:59:47 -0400
commit0f5ce0f0df106bde3b65a97079ebf8cd9e47bc20 (patch)
treee26ac6ed5eb087531930ae8c6bc4d46fefbb64bd
parentca89cfb0e3ea96116c01ec4c11f36a0b504ccde1 (diff)
downloadrust-0f5ce0f0df106bde3b65a97079ebf8cd9e47bc20.tar.gz
rust-0f5ce0f0df106bde3b65a97079ebf8cd9e47bc20.zip
removing 'str'='struct' search synonym
fixes #16384
-rw-r--r--src/librustdoc/html/layout.rs2
-rw-r--r--src/librustdoc/html/static/main.js3
2 files changed, 2 insertions, 3 deletions
diff --git a/src/librustdoc/html/layout.rs b/src/librustdoc/html/layout.rs
index 2e1b8d32dd3..896d070c155 100644
--- a/src/librustdoc/html/layout.rs
+++ b/src/librustdoc/html/layout.rs
@@ -106,7 +106,7 @@ r##"<!DOCTYPE html>
             </p>
             <p>
                 Accepted types are: <code>fn</code>, <code>mod</code>,
-                <code>struct</code> (or <code>str</code>), <code>enum</code>,
+                <code>struct</code>, <code>enum</code>,
                 <code>trait</code>, <code>typedef</code> (or
                 <code>tdef</code>).
             </p>
diff --git a/src/librustdoc/html/static/main.js b/src/librustdoc/html/static/main.js
index 9b44dc63f38..2ce9c53d3e8 100644
--- a/src/librustdoc/html/static/main.js
+++ b/src/librustdoc/html/static/main.js
@@ -370,10 +370,9 @@
         function getQuery() {
             var matches, type, query = $('.search-input').val();
 
-            matches = query.match(/^(fn|mod|str(uct)?|enum|trait|t(ype)?d(ef)?)\s*:\s*/i);
+            matches = query.match(/^(fn|mod|struct|enum|trait|t(ype)?d(ef)?)\s*:\s*/i);
             if (matches) {
                 type = matches[1].replace(/^td$/, 'typedef')
-                                 .replace(/^str$/, 'struct')
                                  .replace(/^tdef$/, 'typedef')
                                  .replace(/^typed$/, 'typedef');
                 query = query.substring(matches[0].length);