diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2012-09-12 10:38:17 -0700 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2012-09-12 13:29:31 -0700 |
| commit | 5d540de76993eb6dac9893138e45d0324c23e631 (patch) | |
| tree | 067007dea6fa0428c80b913a10730ab3323a40f0 /src/libsyntax | |
| parent | 8fbe4b58412b2818d4ef3d92259bdf5f88f61606 (diff) | |
| download | rust-5d540de76993eb6dac9893138e45d0324c23e631.tar.gz rust-5d540de76993eb6dac9893138e45d0324c23e631.zip | |
fixup mutability of vec::each, make iter_bytes pure
also, change DVec() to work with imm vectors rather than mut ones
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ast.rs | 22 | ||||
| -rw-r--r-- | src/libsyntax/ast_util.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/ext/qquote.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/parse/obsolete.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 4 |
5 files changed, 16 insertions, 16 deletions
diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index af7d8d83b6b..38eccd3593f 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -311,7 +311,7 @@ enum binding_mode { } impl binding_mode : to_bytes::IterBytes { - fn iter_bytes(lsb0: bool, f: to_bytes::Cb) { + pure fn iter_bytes(lsb0: bool, f: to_bytes::Cb) { match self { bind_by_value => 0u8.iter_bytes(lsb0, f), @@ -385,7 +385,7 @@ enum pat_ { enum mutability { m_mutbl, m_imm, m_const, } impl mutability : to_bytes::IterBytes { - fn iter_bytes(lsb0: bool, f: to_bytes::Cb) { + pure fn iter_bytes(lsb0: bool, f: to_bytes::Cb) { (self as u8).iter_bytes(lsb0, f) } } @@ -524,7 +524,7 @@ enum inferable<T> { } impl<T: to_bytes::IterBytes> inferable<T> : to_bytes::IterBytes { - fn iter_bytes(lsb0: bool, f: to_bytes::Cb) { + pure fn iter_bytes(lsb0: bool, f: to_bytes::Cb) { match self { expl(ref t) => to_bytes::iter_bytes_2(&0u8, t, lsb0, f), @@ -560,7 +560,7 @@ impl<T:cmp::Eq> inferable<T> : cmp::Eq { enum rmode { by_ref, by_val, by_mutbl_ref, by_move, by_copy } impl rmode : to_bytes::IterBytes { - fn iter_bytes(lsb0: bool, f: to_bytes::Cb) { + pure fn iter_bytes(lsb0: bool, f: to_bytes::Cb) { (self as u8).iter_bytes(lsb0, f) } } @@ -922,7 +922,7 @@ enum trait_method { enum int_ty { ty_i, ty_char, ty_i8, ty_i16, ty_i32, ty_i64, } impl int_ty : to_bytes::IterBytes { - fn iter_bytes(lsb0: bool, f: to_bytes::Cb) { + pure fn iter_bytes(lsb0: bool, f: to_bytes::Cb) { (self as u8).iter_bytes(lsb0, f) } } @@ -951,7 +951,7 @@ impl int_ty: cmp::Eq { enum uint_ty { ty_u, ty_u8, ty_u16, ty_u32, ty_u64, } impl uint_ty : to_bytes::IterBytes { - fn iter_bytes(lsb0: bool, f: to_bytes::Cb) { + pure fn iter_bytes(lsb0: bool, f: to_bytes::Cb) { (self as u8).iter_bytes(lsb0, f) } } @@ -978,7 +978,7 @@ impl uint_ty: cmp::Eq { enum float_ty { ty_f, ty_f32, ty_f64, } impl float_ty : to_bytes::IterBytes { - fn iter_bytes(lsb0: bool, f: to_bytes::Cb) { + pure fn iter_bytes(lsb0: bool, f: to_bytes::Cb) { (self as u8).iter_bytes(lsb0, f) } } @@ -1082,7 +1082,7 @@ impl ty : cmp::Eq { } impl ty : to_bytes::IterBytes { - fn iter_bytes(lsb0: bool, f: to_bytes::Cb) { + pure fn iter_bytes(lsb0: bool, f: to_bytes::Cb) { to_bytes::iter_bytes_2(&self.span.lo, &self.span.hi, lsb0, f); } } @@ -1106,7 +1106,7 @@ enum purity { } impl purity : to_bytes::IterBytes { - fn iter_bytes(lsb0: bool, f: to_bytes::Cb) { + pure fn iter_bytes(lsb0: bool, f: to_bytes::Cb) { (self as u8).iter_bytes(lsb0, f) } } @@ -1126,7 +1126,7 @@ enum ret_style { } impl ret_style : to_bytes::IterBytes { - fn iter_bytes(lsb0: bool, f: to_bytes::Cb) { + pure fn iter_bytes(lsb0: bool, f: to_bytes::Cb) { (self as u8).iter_bytes(lsb0, f) } } @@ -1423,7 +1423,7 @@ enum item_ { enum class_mutability { class_mutable, class_immutable } impl class_mutability : to_bytes::IterBytes { - fn iter_bytes(lsb0: bool, f: to_bytes::Cb) { + pure fn iter_bytes(lsb0: bool, f: to_bytes::Cb) { (self as u8).iter_bytes(lsb0, f) } } diff --git a/src/libsyntax/ast_util.rs b/src/libsyntax/ast_util.rs index b9fed4b46aa..6140014d848 100644 --- a/src/libsyntax/ast_util.rs +++ b/src/libsyntax/ast_util.rs @@ -254,7 +254,7 @@ pure fn is_call_expr(e: @expr) -> bool { // This makes def_id hashable impl def_id : core::to_bytes::IterBytes { #[inline(always)] - fn iter_bytes(lsb0: bool, f: core::to_bytes::Cb) { + pure fn iter_bytes(lsb0: bool, f: core::to_bytes::Cb) { core::to_bytes::iter_bytes_2(&self.crate, &self.node, lsb0, f); } } diff --git a/src/libsyntax/ext/qquote.rs b/src/libsyntax/ext/qquote.rs index 638e46a9cdb..d97124d5f44 100644 --- a/src/libsyntax/ext/qquote.rs +++ b/src/libsyntax/ext/qquote.rs @@ -127,7 +127,7 @@ fn gather_anti_quotes<N: qq_helper>(lo: uint, node: N) -> aq_ctxt pure fn by_lo(a: &gather_item, b: &gather_item) -> bool { a.lo < b.lo } - vec::to_mut(std::sort::merge_sort(by_lo, v)) + std::sort::merge_sort(by_lo, v) }; return cx; } diff --git a/src/libsyntax/parse/obsolete.rs b/src/libsyntax/parse/obsolete.rs index 724c824d5cd..5b0fd67ae50 100644 --- a/src/libsyntax/parse/obsolete.rs +++ b/src/libsyntax/parse/obsolete.rs @@ -35,7 +35,7 @@ impl ObsoleteSyntax : cmp::Eq { impl ObsoleteSyntax: to_bytes::IterBytes { #[inline(always)] - fn iter_bytes(lsb0: bool, f: to_bytes::Cb) { + pure fn iter_bytes(lsb0: bool, f: to_bytes::Cb) { (self as uint).iter_bytes(lsb0, f); } } diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index b8d55fb1055..1089431d810 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -3556,8 +3556,8 @@ impl parser { } {attrs_remaining: attrs, - view_items: vec::from_mut(dvec::unwrap(move view_items)), - items: vec::from_mut(dvec::unwrap(move items))} + view_items: dvec::unwrap(move view_items), + items: dvec::unwrap(move items)} } // Parses a source module as a crate |
