rustdoc: Remove a pointer that's no longer needed

brson · brson · commit 681e5beac438 · 2012-02-24T13:53:28.000-08:00
diff --git a/src/rustdoc/doc.rs b/src/rustdoc/doc.rs
@@ -31,8 +31,7 @@ type itemdoc = {
 
 type moddoc = {
     item: itemdoc,
-    // This box exists to break the structural recursion
-    items: ~[itemtag]
+    items: [itemtag]
 };
 
 type nmoddoc = {
@@ -112,7 +111,7 @@ type tydoc = {
 impl util for moddoc {
 
     fn mods() -> [moddoc] {
-        vec::filter_map(*self.items) {|itemtag|
+        vec::filter_map(self.items) {|itemtag|
             alt itemtag {
               modtag(moddoc) { some(moddoc) }
               _ { none }
@@ -121,7 +120,7 @@ impl util for moddoc {
     }
 
     fn nmods() -> [nmoddoc] {
-        vec::filter_map(*self.items) {|itemtag|
+        vec::filter_map(self.items) {|itemtag|
             alt itemtag {
               nmodtag(nmoddoc) { some(nmoddoc) }
               _ { none }
@@ -130,7 +129,7 @@ impl util for moddoc {
     }
 
     fn fns() -> [fndoc] {
-        vec::filter_map(*self.items) {|itemtag|
+        vec::filter_map(self.items) {|itemtag|
             alt itemtag {
               fntag(fndoc) { some(fndoc) }
               _ { none }
@@ -139,7 +138,7 @@ impl util for moddoc {
     }
 
     fn consts() -> [constdoc] {
-        vec::filter_map(*self.items) {|itemtag|
+        vec::filter_map(self.items) {|itemtag|
             alt itemtag {
               consttag(constdoc) { some(constdoc) }
               _ { none }
@@ -148,7 +147,7 @@ impl util for moddoc {
     }
 
     fn enums() -> [enumdoc] {
-        vec::filter_map(*self.items) {|itemtag|
+        vec::filter_map(self.items) {|itemtag|
             alt itemtag {
               enumtag(enumdoc) { some(enumdoc) }
               _ { none }
@@ -157,7 +156,7 @@ impl util for moddoc {
     }
 
     fn resources() -> [resdoc] {
-        vec::filter_map(*self.items) {|itemtag|
+        vec::filter_map(self.items) {|itemtag|
             alt itemtag {
               restag(resdoc) { some(resdoc) }
               _ { none }
@@ -166,7 +165,7 @@ impl util for moddoc {
     }
 
     fn ifaces() -> [ifacedoc] {
-        vec::filter_map(*self.items) {|itemtag|
+        vec::filter_map(self.items) {|itemtag|
             alt itemtag {
               ifacetag(ifacedoc) { some(ifacedoc) }
               _ { none }
@@ -175,7 +174,7 @@ impl util for moddoc {
     }
 
     fn impls() -> [impldoc] {
-        vec::filter_map(*self.items) {|itemtag|
+        vec::filter_map(self.items) {|itemtag|
             alt itemtag {
               impltag(impldoc) { some(impldoc) }
               _ { none }
@@ -184,7 +183,7 @@ impl util for moddoc {
     }
 
     fn types() -> [tydoc] {
-        vec::filter_map(*self.items) {|itemtag|
+        vec::filter_map(self.items) {|itemtag|
             alt itemtag {
               tytag(tydoc) { some(tydoc) }
               _ { none }
diff --git a/src/rustdoc/extract.rs b/src/rustdoc/extract.rs
@@ -49,7 +49,7 @@ fn moddoc_from_mod(
 ) -> doc::moddoc {
     {
         item: itemdoc,
-        items: ~vec::filter_map(module.items) {|item|
+        items: vec::filter_map(module.items) {|item|
             let itemdoc = mk_itemdoc(item.id, item.ident);
             alt item.node {
               ast::item_mod(m) {
diff --git a/src/rustdoc/fold.rs b/src/rustdoc/fold.rs
@@ -141,7 +141,7 @@ fn default_seq_fold_mod<T>(
 ) -> doc::moddoc {
     {
         item: fold.fold_item(fold, doc.item),
-        items: ~vec::map(*doc.items) {|itemtag|
+        items: vec::map(doc.items) {|itemtag|
             fold_itemtag(fold, itemtag)
         }
         with doc
@@ -167,7 +167,7 @@ fn default_par_fold_mod<T:send>(
 ) -> doc::moddoc {
     {
         item: fold.fold_item(fold, doc.item),
-        items: ~util::parmap(*doc.items) {|itemtag|
+        items: util::parmap(doc.items) {|itemtag|
             fold_itemtag(fold, itemtag)
         }
         with doc
diff --git a/src/rustdoc/markdown_pass.rs b/src/rustdoc/markdown_pass.rs
@@ -130,7 +130,7 @@ fn write_mod_contents(
     write_brief(ctxt, doc.brief());
     write_desc(ctxt, doc.desc());
 
-    for itemtag in *doc.items {
+    for itemtag in doc.items {
         alt itemtag {
           doc::modtag(moddoc) { write_mod(ctxt, moddoc) }
           doc::nmodtag(_) { fail }
@@ -229,7 +229,7 @@ fn should_correctly_indent_fn_signature() {
     let doc = test::create_doc("fn a() { }");
     let doc = {
         topmod: {
-            items: ~[doc::fntag({
+            items: [doc::fntag({
                 sig: some("line 1\nline 2")
                 with doc.topmod.fns()[0]
             })]
diff --git a/src/rustdoc/prune_undoc_items_pass.rs b/src/rustdoc/prune_undoc_items_pass.rs
@@ -36,7 +36,7 @@ fn fold_mod(
     doc: doc::moddoc
 ) -> doc::moddoc {
     let doc = {
-        items: ~vec::filter_map(*doc.items) {|itemtag|
+        items: vec::filter_map(doc.items) {|itemtag|
             alt itemtag {
               doc::modtag(moddoc) {
                 let doc = fold.fold_mod(fold, moddoc);
@@ -110,7 +110,7 @@ fn fold_mod(
     fold.ctxt.have_docs =
         doc.brief() != none
         || doc.desc() != none
-        || vec::is_not_empty(*doc.items);
+        || vec::is_not_empty(doc.items);
     ret doc;
 }
 
diff --git a/src/rustdoc/prune_unexported_pass.rs b/src/rustdoc/prune_unexported_pass.rs
@@ -21,7 +21,7 @@ fn run(srv: astsrv::srv, doc: doc::cratedoc) -> doc::cratedoc {
 fn fold_mod(fold: fold::fold<astsrv::srv>, doc: doc::moddoc) -> doc::moddoc {
     let doc = fold::default_any_fold_mod(fold, doc);
     {
-        items: ~exported_items(fold.ctxt, doc)
+        items: exported_items(fold.ctxt, doc)
         with doc
     }
 }
@@ -66,7 +66,7 @@ fn exported_items_from(
     doc: doc::moddoc,
     is_exported: fn(astsrv::srv, str) -> bool
 ) -> [doc::itemtag] {
-    vec::filter_map(*doc.items) { |itemtag|
+    vec::filter_map(doc.items) { |itemtag|
         let itemtag = alt itemtag {
           doc::enumtag(enumdoc) {
             // Also need to check variant exportedness
diff --git a/src/rustdoc/reexport_pass.rs b/src/rustdoc/reexport_pass.rs
@@ -115,7 +115,7 @@ fn build_reexport_def_map(
     fn fold_mod(fold: fold::fold<ctxt>, doc: doc::moddoc) -> doc::moddoc {
         let doc = fold::default_seq_fold_mod(fold, doc);
 
-        for item in *doc.items {
+        for item in doc.items {
             let def_id = ast_util::local_def(item.id());
             if fold.ctxt.def_set.contains_key(def_id) {
                 fold.ctxt.def_map.insert(def_id, item);
@@ -201,7 +201,7 @@ fn merge_reexports(
         #debug("merging into %?: %?", path, new_items);
 
         {
-            items: ~(*doc.items + new_items)
+            items: (doc.items + new_items)
             with doc
         }
     }
diff --git a/src/rustdoc/rustdoc.rs b/src/rustdoc/rustdoc.rs
@@ -52,7 +52,7 @@ fn test_run_passes() {
                     name: doc.topmod.name() + "two"
                     with doc.topmod.item
                 },
-                items: ~[]
+                items: []
             }
         }
     }
@@ -66,7 +66,7 @@ fn test_run_passes() {
                     name: doc.topmod.name() + "three"
                     with doc.topmod.item
                 },
-                items: ~[]
+                items: []
             }
         }
     }
diff --git a/src/rustdoc/sort_pass.rs b/src/rustdoc/sort_pass.rs
@@ -30,7 +30,7 @@ fn fold_mod(
 ) -> doc::moddoc {
     let doc = fold::default_any_fold_mod(fold, doc);
     {
-        items: ~sort::merge_sort(fold.ctxt, *doc.items)
+        items: sort::merge_sort(fold.ctxt, doc.items)
         with doc
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ fn moddoc_from_mod(`
`49`	`49`	`) -> doc::moddoc {`
`50`	`50`	`{`
`51`	`51`	`item: itemdoc,`
`52`		`- items: ~vec::filter_map(module.items) {\|item\|`
	`52`	`+ items: vec::filter_map(module.items) {\|item\|`
`53`	`53`	`let itemdoc = mk_itemdoc(item.id, item.ident);`
`54`	`54`	`alt item.node {`
`55`	`55`	`ast::item_mod(m) {`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ fn default_seq_fold_mod<T>(`
`141`	`141`	`) -> doc::moddoc {`
`142`	`142`	`{`
`143`	`143`	`item: fold.fold_item(fold, doc.item),`
`144`		`- items: ~vec::map(*doc.items) {\|itemtag\|`
	`144`	`+ items: vec::map(doc.items) {\|itemtag\|`
`145`	`145`	`fold_itemtag(fold, itemtag)`
`146`	`146`	`}`
`147`	`147`	`with doc`
`@@ -167,7 +167,7 @@ fn default_par_fold_mod<T:send>(`
`167`	`167`	`) -> doc::moddoc {`
`168`	`168`	`{`
`169`	`169`	`item: fold.fold_item(fold, doc.item),`
`170`		`- items: ~util::parmap(*doc.items) {\|itemtag\|`
	`170`	`+ items: util::parmap(doc.items) {\|itemtag\|`
`171`	`171`	`fold_itemtag(fold, itemtag)`
`172`	`172`	`}`
`173`	`173`	`with doc`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ fn run(srv: astsrv::srv, doc: doc::cratedoc) -> doc::cratedoc {`
`21`	`21`	`fn fold_mod(fold: fold::fold<astsrv::srv>, doc: doc::moddoc) -> doc::moddoc {`
`22`	`22`	`let doc = fold::default_any_fold_mod(fold, doc);`
`23`	`23`	`{`
`24`		`- items: ~exported_items(fold.ctxt, doc)`
	`24`	`+ items: exported_items(fold.ctxt, doc)`
`25`	`25`	`with doc`
`26`	`26`	`}`
`27`	`27`	`}`
`@@ -66,7 +66,7 @@ fn exported_items_from(`
`66`	`66`	`doc: doc::moddoc,`
`67`	`67`	`is_exported: fn(astsrv::srv, str) -> bool`
`68`	`68`	`) -> [doc::itemtag] {`
`69`		`- vec::filter_map(*doc.items) { \|itemtag\|`
	`69`	`+ vec::filter_map(doc.items) { \|itemtag\|`
`70`	`70`	`let itemtag = alt itemtag {`
`71`	`71`	`doc::enumtag(enumdoc) {`
`72`	`72`	`// Also need to check variant exportedness`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ fn build_reexport_def_map(`
`115`	`115`	`fn fold_mod(fold: fold::fold<ctxt>, doc: doc::moddoc) -> doc::moddoc {`
`116`	`116`	`let doc = fold::default_seq_fold_mod(fold, doc);`
`117`	`117`
`118`		`- for item in *doc.items {`
	`118`	`+ for item in doc.items {`
`119`	`119`	`let def_id = ast_util::local_def(item.id());`
`120`	`120`	`if fold.ctxt.def_set.contains_key(def_id) {`
`121`	`121`	`fold.ctxt.def_map.insert(def_id, item);`
`@@ -201,7 +201,7 @@ fn merge_reexports(`
`201`	`201`	`#debug("merging into %?: %?", path, new_items);`
`202`	`202`
`203`	`203`	`{`
`204`		`- items: ~(*doc.items + new_items)`
	`204`	`+ items: (doc.items + new_items)`
`205`	`205`	`with doc`
`206`	`206`	`}`
`207`	`207`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ fn test_run_passes() {`
`52`	`52`	`name: doc.topmod.name() + "two"`
`53`	`53`	`with doc.topmod.item`
`54`	`54`	`},`
`55`		`- items: ~[]`
	`55`	`+ items: []`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`	`}`
`@@ -66,7 +66,7 @@ fn test_run_passes() {`
`66`	`66`	`name: doc.topmod.name() + "three"`
`67`	`67`	`with doc.topmod.item`
`68`	`68`	`},`
`69`		`- items: ~[]`
	`69`	`+ items: []`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ fn fold_mod(`
`30`	`30`	`) -> doc::moddoc {`
`31`	`31`	`let doc = fold::default_any_fold_mod(fold, doc);`
`32`	`32`	`{`
`33`		`- items: ~sort::merge_sort(fold.ctxt, *doc.items)`
	`33`	`+ items: sort::merge_sort(fold.ctxt, doc.items)`
`34`	`34`	`with doc`
`35`	`35`	`}`
`36`	`36`	`}`