From 13076eb3b0223ef5bb4a5d7ba12a3a4faa0de34a Mon Sep 17 00:00:00 2001 From: Ben Striegel Date: Tue, 29 Jan 2013 23:27:51 -0500 Subject: [PATCH] Fix RIMOV damage to libsyntax --- src/libsyntax/attr.rs | 4 ++-- src/libsyntax/print/pp.rs | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/libsyntax/attr.rs b/src/libsyntax/attr.rs index 47aa84bb7521..80879e5c6a00 100644 --- a/src/libsyntax/attr.rs +++ b/src/libsyntax/attr.rs @@ -269,9 +269,9 @@ pub fn sort_meta_items(+items: ~[@ast::meta_item]) -> ~[@ast::meta_item] { } // This is sort of stupid here, converting to a vec of mutables and back - let mut v: ~[@ast::meta_item] = vec::cast_to_mut(items); + let mut v: ~[@ast::meta_item] = items; std::sort::quick_sort(v, lteq); - vec::cast_from_mut(move v) + move v } pub fn remove_meta_items_by_name(items: ~[@ast::meta_item], name: ~str) -> diff --git a/src/libsyntax/print/pp.rs b/src/libsyntax/print/pp.rs index d7efff4d02a7..27d49d5801ed 100644 --- a/src/libsyntax/print/pp.rs +++ b/src/libsyntax/print/pp.rs @@ -148,17 +148,17 @@ pub fn mk_printer(out: io::Writer, linewidth: uint) -> printer { // fall behind. let n: uint = 3 * linewidth; debug!("mk_printer %u", linewidth); - let mut token: ~[token] = vec::cast_to_mut(vec::from_elem(n, EOF)); - let mut size: ~[int] = vec::cast_to_mut(vec::from_elem(n, 0)); - let mut scan_stack: ~[uint] = vec::cast_to_mut(vec::from_elem(n, 0u)); + let mut token: ~[token] = vec::from_elem(n, EOF); + let mut size: ~[int] = vec::from_elem(n, 0); + let mut scan_stack: ~[uint] = vec::from_elem(n, 0u); printer_(@{out: out, buf_len: n, mut margin: linewidth as int, mut space: linewidth as int, mut left: 0, mut right: 0, - token: move token, - size: move size, + mut token: move token, + mut size: move size, mut left_total: 0, mut right_total: 0, mut scan_stack: move scan_stack,