librustdoc: Remove pure from fuzzer and rustdoc.

pcwalton · pcwalton · commit fbe22afdbe4d · 2013-03-22T12:57:28.000-07:00
diff --git a/src/libcore/str.rs b/src/libcore/str.rs
@@ -525,7 +525,7 @@ pub fn split_no_trailing(s: &str, sepfn: &fn(char) -> bool) -> ~[~str] {
     split_inner(s, sepfn, len(s), true, false)
 }
 
-pure fn split_inner(s: &str, sepfn: &fn(cc: char) -> bool, count: uint,
+fn split_inner(s: &str, sepfn: &fn(cc: char) -> bool, count: uint,
                allow_empty: bool, allow_trailing_empty: bool) -> ~[~str] {
     let l = len(s);
     let mut result = ~[], i = 0u, start = 0u, done = 0u;
diff --git a/src/libfuzzer/ast_match.rs b/src/libfuzzer/ast_match.rs
@@ -25,8 +25,8 @@ fn vec_equal<T>(v: ~[T],
     return true;
 }
 
-pure fn builtin_equal<T>(&&a: T, &&b: T) -> bool { return a == b; }
-pure fn builtin_equal_int(&&a: int, &&b: int) -> bool { return a == b; }
+fn builtin_equal<T>(&&a: T, &&b: T) -> bool { return a == b; }
+fn builtin_equal_int(&&a: int, &&b: int) -> bool { return a == b; }
 
 fn main() {
     fail_unless!((builtin_equal(5, 5)));
diff --git a/src/libfuzzer/fuzzer.rc b/src/libfuzzer/fuzzer.rc
@@ -95,11 +95,11 @@ pub fn common_exprs() -> ~[ast::expr] {
     ]
 }
 
-pub pure fn safe_to_steal_expr(e: @ast::expr, tm: test_mode) -> bool {
+pub fn safe_to_steal_expr(e: @ast::expr, tm: test_mode) -> bool {
     safe_to_use_expr(*e, tm)
 }
 
-pub pure fn safe_to_use_expr(e: ast::expr, tm: test_mode) -> bool {
+pub fn safe_to_use_expr(e: ast::expr, tm: test_mode) -> bool {
     match tm {
       tm_converge => {
         match e.node {
diff --git a/src/librustdoc/config.rs b/src/librustdoc/config.rs
@@ -29,10 +29,10 @@ pub enum OutputFormat {
 }
 
 impl cmp::Eq for OutputFormat {
-    pure fn eq(&self, other: &OutputFormat) -> bool {
+    fn eq(&self, other: &OutputFormat) -> bool {
         ((*self) as uint) == ((*other) as uint)
     }
-    pure fn ne(&self, other: &OutputFormat) -> bool { !(*self).eq(other) }
+    fn ne(&self, other: &OutputFormat) -> bool { !(*self).eq(other) }
 }
 
 /// How to organize the output
@@ -44,10 +44,10 @@ pub enum OutputStyle {
 }
 
 impl cmp::Eq for OutputStyle {
-    pure fn eq(&self, other: &OutputStyle) -> bool {
+    fn eq(&self, other: &OutputStyle) -> bool {
         ((*self) as uint) == ((*other) as uint)
     }
-    pure fn ne(&self, other: &OutputStyle) -> bool { !(*self).eq(other) }
+    fn ne(&self, other: &OutputStyle) -> bool { !(*self).eq(other) }
 }
 
 /// The configuration for a rustdoc session
diff --git a/src/librustdoc/doc.rs b/src/librustdoc/doc.rs
@@ -358,11 +358,11 @@ impl PageUtils for ~[Page] {
 }
 
 pub trait Item {
-    pure fn item(&self) -> ItemDoc;
+    fn item(&self) -> ItemDoc;
 }
 
 impl Item for ItemTag {
-    pure fn item(&self) -> ItemDoc {
+    fn item(&self) -> ItemDoc {
         match self {
           &doc::ModTag(ref doc) => copy doc.item,
           &doc::NmodTag(ref doc) => copy doc.item,
@@ -378,64 +378,64 @@ impl Item for ItemTag {
 }
 
 impl Item for SimpleItemDoc {
-    pure fn item(&self) -> ItemDoc { copy self.item }
+    fn item(&self) -> ItemDoc { copy self.item }
 }
 
 impl Item for ModDoc {
-    pure fn item(&self) -> ItemDoc { copy self.item }
+    fn item(&self) -> ItemDoc { copy self.item }
 }
 
 impl Item for NmodDoc {
-    pure fn item(&self) -> ItemDoc { copy self.item }
+    fn item(&self) -> ItemDoc { copy self.item }
 }
 
 impl Item for EnumDoc {
-    pure fn item(&self) -> ItemDoc { copy self.item }
+    fn item(&self) -> ItemDoc { copy self.item }
 }
 
 impl Item for TraitDoc {
-    pure fn item(&self) -> ItemDoc { copy self.item }
+    fn item(&self) -> ItemDoc { copy self.item }
 }
 
 impl Item for ImplDoc {
-    pure fn item(&self) -> ItemDoc { copy self.item }
+    fn item(&self) -> ItemDoc { copy self.item }
 }
 
 impl Item for StructDoc {
-    pure fn item(&self) -> ItemDoc { copy self.item }
+    fn item(&self) -> ItemDoc { copy self.item }
 }
 
 pub trait ItemUtils {
-    pure fn id(&self) -> AstId;
-    pure fn name(&self) -> ~str;
-    pure fn path(&self) -> ~[~str];
-    pure fn brief(&self) -> Option<~str>;
-    pure fn desc(&self) -> Option<~str>;
-    pure fn sections(&self) -> ~[Section];
+    fn id(&self) -> AstId;
+    fn name(&self) -> ~str;
+    fn path(&self) -> ~[~str];
+    fn brief(&self) -> Option<~str>;
+    fn desc(&self) -> Option<~str>;
+    fn sections(&self) -> ~[Section];
 }
 
 impl<A:Item> ItemUtils for A {
-    pure fn id(&self) -> AstId {
+    fn id(&self) -> AstId {
         self.item().id
     }
 
-    pure fn name(&self) -> ~str {
+    fn name(&self) -> ~str {
         copy self.item().name
     }
 
-    pure fn path(&self) -> ~[~str] {
+    fn path(&self) -> ~[~str] {
         copy self.item().path
     }
 
-    pure fn brief(&self) -> Option<~str> {
+    fn brief(&self) -> Option<~str> {
         copy self.item().brief
     }
 
-    pure fn desc(&self) -> Option<~str> {
+    fn desc(&self) -> Option<~str> {
         copy self.item().desc
     }
 
-    pure fn sections(&self) -> ~[Section] {
+    fn sections(&self) -> ~[Section] {
         copy self.item().sections
     }
 }
diff --git a/src/librustdoc/markdown_pass.rs b/src/librustdoc/markdown_pass.rs
@@ -45,8 +45,8 @@ fn run(
     writer_factory: WriterFactory
 ) -> doc::Doc {
 
-    pure fn mods_last(item1: &doc::ItemTag, item2: &doc::ItemTag) -> bool {
-        pure fn is_mod(item: &doc::ItemTag) -> bool {
+    fn mods_last(item1: &doc::ItemTag, item2: &doc::ItemTag) -> bool {
+        fn is_mod(item: &doc::ItemTag) -> bool {
             match *item {
               doc::ModTag(_) => true,
               _ => false
diff --git a/src/librustdoc/sort_item_name_pass.rs b/src/librustdoc/sort_item_name_pass.rs
@@ -16,7 +16,7 @@ use pass::Pass;
 use sort_pass;
 
 pub fn mk_pass() -> Pass {
-    pure fn by_item_name(item1: &doc::ItemTag, item2: &doc::ItemTag) -> bool {
+    fn by_item_name(item1: &doc::ItemTag, item2: &doc::ItemTag) -> bool {
         (*item1).name() <= (*item2).name()
     }
     sort_pass::mk_pass(~"sort_item_name", by_item_name)
diff --git a/src/librustdoc/sort_item_type_pass.rs b/src/librustdoc/sort_item_type_pass.rs
@@ -15,8 +15,8 @@ use pass::Pass;
 use sort_pass;
 
 pub fn mk_pass() -> Pass {
-    pure fn by_score(item1: &doc::ItemTag, item2: &doc::ItemTag) -> bool {
-        pure fn score(item: &doc::ItemTag) -> int {
+    fn by_score(item1: &doc::ItemTag, item2: &doc::ItemTag) -> bool {
+        fn score(item: &doc::ItemTag) -> int {
             match *item {
               doc::ConstTag(_) => 0,
               doc::TyTag(_) => 1,
diff --git a/src/librustdoc/sort_pass.rs b/src/librustdoc/sort_pass.rs
@@ -21,7 +21,7 @@ use util::NominalOp;
 
 use std::sort;
 
-pub type ItemLtEqOp = @pure fn(v1: &doc::ItemTag, v2:  &doc::ItemTag) -> bool;
+pub type ItemLtEqOp = @fn(v1: &doc::ItemTag, v2:  &doc::ItemTag) -> bool;
 
 type ItemLtEq = NominalOp<ItemLtEqOp>;
 
@@ -59,7 +59,7 @@ fn fold_mod(
 
 #[test]
 fn test() {
-    pure fn name_lteq(item1: &doc::ItemTag, item2: &doc::ItemTag) -> bool {
+    fn name_lteq(item1: &doc::ItemTag, item2: &doc::ItemTag) -> bool {
         (*item1).name() <= (*item2).name()
     }
 
@@ -76,7 +76,7 @@ fn test() {
 
 #[test]
 fn should_be_stable() {
-    pure fn always_eq(_item1: &doc::ItemTag, _item2: &doc::ItemTag) -> bool {
+    fn always_eq(_item1: &doc::ItemTag, _item2: &doc::ItemTag) -> bool {
         true
     }
 

Original file line number	Diff line number	Diff line change
`@@ -525,7 +525,7 @@ pub fn split_no_trailing(s: &str, sepfn: &fn(char) -> bool) -> ~[~str] {`
`525`	`525`	`split_inner(s, sepfn, len(s), true, false)`
`526`	`526`	`}`
`527`	`527`
`528`		`-pure fn split_inner(s: &str, sepfn: &fn(cc: char) -> bool, count: uint,`
	`528`	`+fn split_inner(s: &str, sepfn: &fn(cc: char) -> bool, count: uint,`
`529`	`529`	`allow_empty: bool, allow_trailing_empty: bool) -> ~[~str] {`
`530`	`530`	`let l = len(s);`
`531`	`531`	`let mut result = ~[], i = 0u, start = 0u, done = 0u;`
Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@ fn vec_equal<T>(v: ~[T],`
`25`	`25`	`return true;`
`26`	`26`	`}`
`27`	`27`
`28`		`-pure fn builtin_equal<T>(&&a: T, &&b: T) -> bool { return a == b; }`
`29`		`-pure fn builtin_equal_int(&&a: int, &&b: int) -> bool { return a == b; }`
	`28`	`+fn builtin_equal<T>(&&a: T, &&b: T) -> bool { return a == b; }`
	`29`	`+fn builtin_equal_int(&&a: int, &&b: int) -> bool { return a == b; }`
`30`	`30`
`31`	`31`	`fn main() {`
`32`	`32`	`fail_unless!((builtin_equal(5, 5)));`
Original file line number	Diff line number	Diff line change
`@@ -95,11 +95,11 @@ pub fn common_exprs() -> ~[ast::expr] {`
`95`	`95`	`]`
`96`	`96`	`}`
`97`	`97`
`98`		`-pub pure fn safe_to_steal_expr(e: @ast::expr, tm: test_mode) -> bool {`
	`98`	`+pub fn safe_to_steal_expr(e: @ast::expr, tm: test_mode) -> bool {`
`99`	`99`	`safe_to_use_expr(*e, tm)`
`100`	`100`	`}`
`101`	`101`
`102`		`-pub pure fn safe_to_use_expr(e: ast::expr, tm: test_mode) -> bool {`
	`102`	`+pub fn safe_to_use_expr(e: ast::expr, tm: test_mode) -> bool {`
`103`	`103`	`match tm {`
`104`	`104`	`tm_converge => {`
`105`	`105`	`match e.node {`
Original file line number	Diff line number	Diff line change
`@@ -29,10 +29,10 @@ pub enum OutputFormat {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`impl cmp::Eq for OutputFormat {`
`32`		`- pure fn eq(&self, other: &OutputFormat) -> bool {`
	`32`	`+ fn eq(&self, other: &OutputFormat) -> bool {`
`33`	`33`	`((self) as uint) == ((other) as uint)`
`34`	`34`	`}`
`35`		`- pure fn ne(&self, other: &OutputFormat) -> bool { !(*self).eq(other) }`
	`35`	`+ fn ne(&self, other: &OutputFormat) -> bool { !(*self).eq(other) }`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`/// How to organize the output`
`@@ -44,10 +44,10 @@ pub enum OutputStyle {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`impl cmp::Eq for OutputStyle {`
`47`		`- pure fn eq(&self, other: &OutputStyle) -> bool {`
	`47`	`+ fn eq(&self, other: &OutputStyle) -> bool {`
`48`	`48`	`((self) as uint) == ((other) as uint)`
`49`	`49`	`}`
`50`		`- pure fn ne(&self, other: &OutputStyle) -> bool { !(*self).eq(other) }`
	`50`	`+ fn ne(&self, other: &OutputStyle) -> bool { !(*self).eq(other) }`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`/// The configuration for a rustdoc session`
Original file line number	Diff line number	Diff line change
`@@ -358,11 +358,11 @@ impl PageUtils for ~[Page] {`
`358`	`358`	`}`
`359`	`359`
`360`	`360`	`pub trait Item {`
`361`		`- pure fn item(&self) -> ItemDoc;`
	`361`	`+ fn item(&self) -> ItemDoc;`
`362`	`362`	`}`
`363`	`363`
`364`	`364`	`impl Item for ItemTag {`
`365`		`- pure fn item(&self) -> ItemDoc {`
	`365`	`+ fn item(&self) -> ItemDoc {`
`366`	`366`	`match self {`
`367`	`367`	`&doc::ModTag(ref doc) => copy doc.item,`
`368`	`368`	`&doc::NmodTag(ref doc) => copy doc.item,`
`@@ -378,64 +378,64 @@ impl Item for ItemTag {`
`378`	`378`	`}`
`379`	`379`
`380`	`380`	`impl Item for SimpleItemDoc {`
`381`		`- pure fn item(&self) -> ItemDoc { copy self.item }`
	`381`	`+ fn item(&self) -> ItemDoc { copy self.item }`
`382`	`382`	`}`
`383`	`383`
`384`	`384`	`impl Item for ModDoc {`
`385`		`- pure fn item(&self) -> ItemDoc { copy self.item }`
	`385`	`+ fn item(&self) -> ItemDoc { copy self.item }`
`386`	`386`	`}`
`387`	`387`
`388`	`388`	`impl Item for NmodDoc {`
`389`		`- pure fn item(&self) -> ItemDoc { copy self.item }`
	`389`	`+ fn item(&self) -> ItemDoc { copy self.item }`
`390`	`390`	`}`
`391`	`391`
`392`	`392`	`impl Item for EnumDoc {`
`393`		`- pure fn item(&self) -> ItemDoc { copy self.item }`
	`393`	`+ fn item(&self) -> ItemDoc { copy self.item }`
`394`	`394`	`}`
`395`	`395`
`396`	`396`	`impl Item for TraitDoc {`
`397`		`- pure fn item(&self) -> ItemDoc { copy self.item }`
	`397`	`+ fn item(&self) -> ItemDoc { copy self.item }`
`398`	`398`	`}`
`399`	`399`
`400`	`400`	`impl Item for ImplDoc {`
`401`		`- pure fn item(&self) -> ItemDoc { copy self.item }`
	`401`	`+ fn item(&self) -> ItemDoc { copy self.item }`
`402`	`402`	`}`
`403`	`403`
`404`	`404`	`impl Item for StructDoc {`
`405`		`- pure fn item(&self) -> ItemDoc { copy self.item }`
	`405`	`+ fn item(&self) -> ItemDoc { copy self.item }`
`406`	`406`	`}`
`407`	`407`
`408`	`408`	`pub trait ItemUtils {`
`409`		`- pure fn id(&self) -> AstId;`
`410`		`- pure fn name(&self) -> ~str;`
`411`		`- pure fn path(&self) -> ~[~str];`
`412`		`- pure fn brief(&self) -> Option<~str>;`
`413`		`- pure fn desc(&self) -> Option<~str>;`
`414`		`- pure fn sections(&self) -> ~[Section];`
	`409`	`+ fn id(&self) -> AstId;`
	`410`	`+ fn name(&self) -> ~str;`
	`411`	`+ fn path(&self) -> ~[~str];`
	`412`	`+ fn brief(&self) -> Option<~str>;`
	`413`	`+ fn desc(&self) -> Option<~str>;`
	`414`	`+ fn sections(&self) -> ~[Section];`
`415`	`415`	`}`
`416`	`416`
`417`	`417`	`impl<A:Item> ItemUtils for A {`
`418`		`- pure fn id(&self) -> AstId {`
	`418`	`+ fn id(&self) -> AstId {`
`419`	`419`	`self.item().id`
`420`	`420`	`}`
`421`	`421`
`422`		`- pure fn name(&self) -> ~str {`
	`422`	`+ fn name(&self) -> ~str {`
`423`	`423`	`copy self.item().name`
`424`	`424`	`}`
`425`	`425`
`426`		`- pure fn path(&self) -> ~[~str] {`
	`426`	`+ fn path(&self) -> ~[~str] {`
`427`	`427`	`copy self.item().path`
`428`	`428`	`}`
`429`	`429`
`430`		`- pure fn brief(&self) -> Option<~str> {`
	`430`	`+ fn brief(&self) -> Option<~str> {`
`431`	`431`	`copy self.item().brief`
`432`	`432`	`}`
`433`	`433`
`434`		`- pure fn desc(&self) -> Option<~str> {`
	`434`	`+ fn desc(&self) -> Option<~str> {`
`435`	`435`	`copy self.item().desc`
`436`	`436`	`}`
`437`	`437`
`438`		`- pure fn sections(&self) -> ~[Section] {`
	`438`	`+ fn sections(&self) -> ~[Section] {`
`439`	`439`	`copy self.item().sections`
`440`	`440`	`}`
`441`	`441`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ use pass::Pass;`
`16`	`16`	`use sort_pass;`
`17`	`17`
`18`	`18`	`pub fn mk_pass() -> Pass {`
`19`		`- pure fn by_item_name(item1: &doc::ItemTag, item2: &doc::ItemTag) -> bool {`
	`19`	`+ fn by_item_name(item1: &doc::ItemTag, item2: &doc::ItemTag) -> bool {`
`20`	`20`	`(item1).name() <= (item2).name()`
`21`	`21`	`}`
`22`	`22`	`sort_pass::mk_pass(~"sort_item_name", by_item_name)`