librustdoc: Remove pure from fuzzer and rustdoc.

Author: pcwalton

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;

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)));

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 {

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

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
     }
 }

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

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)

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,

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
     }