---

yaml
---
r: 111002
b: refs/heads/snap-stage3
c: 8f5d71c
h: refs/heads/master
v: v3

Author: lifthrasiir

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 296e60be6b027a52de58251848037a92f23a0878
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 9eb336a0206178f52146d41dd152166233df703b
+refs/heads/snap-stage3: 8f5d71cf71849bea25f87836cec1b06b476baf37
 refs/heads/try: 38201d7c6bf0c32b0e5bdc8ecd63976ebc1b3a4c
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustdoc/html/render.rs

@@ -309,12 +309,23 @@ pub fn run(mut krate: clean::Crate, dst: Path) -> io::IoResult<()> {
     let index = {
         let mut w = MemWriter::new();
         try!(write!(&mut w, r#"searchIndex['{}'] = \{"items":["#, krate.name));
+
+        let mut lastpath = ~"";
         for (i, item) in cache.search_index.iter().enumerate() {
+            // Omit the path if it is same to that of the prior item.
+            let path;
+            if lastpath == item.path {
+                path = "";
+            } else {
+                lastpath = item.path.clone();
+                path = item.path.as_slice();
+            };
+
             if i > 0 {
                 try!(write!(&mut w, ","));
             }
             try!(write!(&mut w, r#"[{:u},"{}","{}",{}"#,
-                        item.ty, item.name, item.path,
+                        item.ty, item.name, path,
                         item.desc.to_json().to_str()));
             match item.parent {
                 Some(nodeid) => {
@@ -325,7 +336,9 @@ pub fn run(mut krate: clean::Crate, dst: Path) -> io::IoResult<()> {
             }
             try!(write!(&mut w, "]"));
         }
+
         try!(write!(&mut w, r#"],"paths":["#));
+
         for (i, &nodeid) in pathid_to_nodeid.iter().enumerate() {
             let &(ref fqp, short) = cache.paths.find(&nodeid).unwrap();
             if i > 0 {
@@ -334,6 +347,7 @@ pub fn run(mut krate: clean::Crate, dst: Path) -> io::IoResult<()> {
             try!(write!(&mut w, r#"[{:u},"{}"]"#,
                         short, *fqp.last().unwrap()));
         }
+
         try!(write!(&mut w, r"]\};"));
 
         str::from_utf8(w.unwrap().as_slice()).unwrap().to_owned()

branches/snap-stage3/src/librustdoc/html/static/main.js

@@ -539,7 +539,7 @@
 
                 // an array of [(Number) item type,
                 //              (String) name,
-                //              (String) full path,
+                //              (String) full path or empty string for previous path,
                 //              (String) description,
                 //              (optional Number) the parent path index to `paths`]
                 var items = rawSearchIndex[crate].items;
@@ -561,10 +561,11 @@
                 // all other search operations have access to this cached data for
                 // faster analysis operations
                 var len = items.length;
+                var lastPath = "";
                 for (var i = 0; i < len; i += 1) {
                     var rawRow = items[i];
                     var row = {crate: crate, ty: rawRow[0], name: rawRow[1],
-                               path: rawRow[2], desc: rawRow[3],
+                               path: rawRow[2] || lastPath, desc: rawRow[3],
                                parent: paths[rawRow[4]]};
                     searchIndex.push(row);
                     if (typeof row.name === "string") {
@@ -573,6 +574,7 @@
                     } else {
                         searchWords.push("");
                     }
+                    lastPath = row.path;
                 }
             }
             return searchWords;