user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

RIMOV, round 3

Browse source 
find ./ -type f -name "*.rs" -exec sed -i "s/let \(.*\)\[mut[ ]\?/let
mut \1\[/g" {} \;
This commit is contained in:
Ben Striegel 2013-01-29 21:11:43 -05:00
parent 097c8aefea
commit 5577ce635f
30 changed files with 71 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libcore/uint-template.rs
View file

@ -252,7 +252,7 @@ pub pure fn to_str_bytes<U>(neg: bool, num: T, radix: uint,
// Enough room to hold any number in any radix.
// Worst case: 64-bit number, binary-radix, with
// a leading negative sign = 65 bytes.
let buf : [mut u8 * 65] = [mut 0u8, ..65];
let mut buf : [mut u8 * 65] = [0u8, ..65];
let len = buf.len();
let mut i = len;

16
src/libcore/vec.rs
View file

@ -3155,7 +3155,7 @@ mod tests {
#[test]
fn reverse_and_reversed() {
let v: ~[mut int] = ~[mut 10, 20];
let mut v: ~[mut int] = ~[10, 20];
assert (v[0] == 10);
assert (v[1] == 20);
reverse(v);
@ -3170,13 +3170,13 @@ mod tests {
let v4 = reversed::<int>(~[]);
assert (v4 == ~[]);
let v3: ~[mut int] = ~[mut];
let mut v3: ~[mut int] = ~[];
reverse::<int>(v3);
}
#[test]
fn reversed_mut() {
let v2 = reversed::<int>(~[mut 10, 20]);
let mut v2 = reversed::<int>(~[10, 20]);
assert (v2[0] == 20);
assert (v2[1] == 10);
}
@ -3302,7 +3302,7 @@ mod tests {
#[test]
fn cast_from_mut_no_copy() {
unsafe {
let x = ~[mut 1, 2, 3];
let mut x = ~[1, 2, 3];
let addr = raw::to_ptr(x);
let x_imm = cast_from_mut(x);
let addr_imm = raw::to_ptr(x_imm);
@ -3564,7 +3564,7 @@ mod tests {
#[ignore(windows)]
#[should_fail]
fn test_consume_mut_fail() {
let v = ~[mut (~0, @0), (~0, @0), (~0, @0), (~0, @0)];
let mut v = ~[(~0, @0), (~0, @0), (~0, @0), (~0, @0)];
let mut i = 0;
do consume_mut(v) |_i, _elt| {
if i == 2 {
@ -3592,7 +3592,7 @@ mod tests {
#[ignore(windows)]
#[should_fail]
fn test_map_fail() {
let v = [mut (~0, @0), (~0, @0), (~0, @0), (~0, @0)];
let mut v = [(~0, @0), (~0, @0), (~0, @0), (~0, @0)];
let mut i = 0;
do map(v) |_elt| {
if i == 2 {
@ -3918,7 +3918,7 @@ mod tests {
#[ignore(cfg(windows))]
#[should_fail]
fn test_as_mut_buf_fail() {
let v = [mut (~0, @0), (~0, @0), (~0, @0), (~0, @0)];
let mut v = [(~0, @0), (~0, @0), (~0, @0), (~0, @0)];
do as_mut_buf(v) |_buf, _i| {
fail
}
@ -3929,7 +3929,7 @@ mod tests {
#[ignore(cfg(windows))]
fn test_copy_memory_oob() {
unsafe {
let a = [mut 1, 2, 3, 4];
let mut a = [1, 2, 3, 4];
let b = [1, 2, 3, 4, 5];
raw::copy_memory(a, b, 5);
}

2
src/libfuzzer/cycles.rs
View file

@ -68,7 +68,7 @@ fn nop<T>(_x: T) { }
fn test_cycles(r : rand::rng, k: uint, n: uint)
{
let v : ~[mut @pointy] = ~[mut];
let mut v : ~[mut @pointy] = ~[];
// Create a graph with no edges
range(0u, vlen) {|_i|

2
src/libfuzzer/rand_util.rs
View file

@ -86,7 +86,7 @@ fn main()
log(error, choice(r, ~[10, 20, 30]));
log(error, if unlikely(r, 5u) { "unlikely" } else { "likely" });
let a = ~[mut 1, 2, 3];
let mut a = ~[1, 2, 3];
shuffle(r, a);
log(error, a);

2
src/libstd/rope.rs
View file

@ -1163,7 +1163,7 @@ pub mod node {
}
pub fn empty() -> T {
let stack : ~[mut @Node] = ~[mut];
let mut stack : ~[mut @Node] = ~[];
T { stack: stack, stackpos: -1 }
}

58
src/libstd/sort.rs
View file

@ -740,24 +740,24 @@ mod test_qsort3 {
#[test]
pub fn test() {
{
let v1 = ~[mut 3, 7, 4, 5, 2, 9, 5, 8];
let v2 = ~[mut 2, 3, 4, 5, 5, 7, 8, 9];
let mut v1 = ~[3, 7, 4, 5, 2, 9, 5, 8];
let mut v2 = ~[2, 3, 4, 5, 5, 7, 8, 9];
check_sort(v1, v2);
}
{
let v1 = ~[mut 1, 1, 1];
let v2 = ~[mut 1, 1, 1];
let mut v1 = ~[1, 1, 1];
let mut v2 = ~[1, 1, 1];
check_sort(v1, v2);
}
{
let v1: ~[mut int] = ~[mut];
let v2: ~[mut int] = ~[mut];
let mut v1: ~[mut int] = ~[];
let mut v2: ~[mut int] = ~[];
check_sort(v1, v2);
}
{ let v1 = ~[mut 9]; let v2 = ~[mut 9]; check_sort(v1, v2); }
{ let mut v1 = ~[mut 9]; let v2 = ~[9]; check_sort(v1, v2); }
{
let v1 = ~[mut 9, 3, 3, 3, 9];
let v2 = ~[mut 3, 3, 3, 9, 9];
let mut v1 = ~[9, 3, 3, 3, 9];
let mut v2 = ~[3, 3, 3, 9, 9];
check_sort(v1, v2);
}
}
@ -787,24 +787,24 @@ mod test_qsort {
#[test]
pub fn test() {
{
let v1 = ~[mut 3, 7, 4, 5, 2, 9, 5, 8];
let v2 = ~[mut 2, 3, 4, 5, 5, 7, 8, 9];
let mut v1 = ~[3, 7, 4, 5, 2, 9, 5, 8];
let mut v2 = ~[2, 3, 4, 5, 5, 7, 8, 9];
check_sort(v1, v2);
}
{
let v1 = ~[mut 1, 1, 1];
let v2 = ~[mut 1, 1, 1];
let mut v1 = ~[1, 1, 1];
let mut v2 = ~[1, 1, 1];
check_sort(v1, v2);
}
{
let v1: ~[mut int] = ~[mut];
let v2: ~[mut int] = ~[mut];
let mut v1: ~[mut int] = ~[];
let mut v2: ~[mut int] = ~[];
check_sort(v1, v2);
}
{ let v1 = ~[mut 9]; let v2 = ~[mut 9]; check_sort(v1, v2); }
{ let mut v1 = ~[mut 9]; let v2 = ~[9]; check_sort(v1, v2); }
{
let v1 = ~[mut 9, 3, 3, 3, 9];
let v2 = ~[mut 3, 3, 3, 9, 9];
let mut v1 = ~[9, 3, 3, 3, 9];
let mut v2 = ~[3, 3, 3, 9, 9];
check_sort(v1, v2);
}
}
@ -812,7 +812,7 @@ mod test_qsort {
// Regression test for #750
#[test]
pub fn test_simple() {
let names = ~[mut 2, 1, 3];
let mut names = ~[2, 1, 3];
let expected = ~[1, 2, 3];
@ -870,7 +870,7 @@ mod tests {
#[test]
pub fn test_merge_sort_mutable() {
pub pure fn le(a: &int, b: &int) -> bool { *a <= *b }
let v1 = ~[mut 3, 2, 1];
let mut v1 = ~[3, 2, 1];
let v2 = merge_sort(v1, le);
assert v2 == ~[1, 2, 3];
}
@ -937,24 +937,24 @@ mod test_tim_sort {
#[test]
fn test() {
{
let v1 = ~[mut 3, 7, 4, 5, 2, 9, 5, 8];
let v2 = ~[mut 2, 3, 4, 5, 5, 7, 8, 9];
let mut v1 = ~[3, 7, 4, 5, 2, 9, 5, 8];
let mut v2 = ~[2, 3, 4, 5, 5, 7, 8, 9];
check_sort(v1, v2);
}
{
let v1 = ~[mut 1, 1, 1];
let v2 = ~[mut 1, 1, 1];
let mut v1 = ~[1, 1, 1];
let mut v2 = ~[1, 1, 1];
check_sort(v1, v2);
}
{
let v1: ~[mut int] = ~[mut];
let v2: ~[mut int] = ~[mut];
let mut v1: ~[mut int] = ~[];
let mut v2: ~[mut int] = ~[];
check_sort(v1, v2);
}
{ let v1 = ~[mut 9]; let v2 = ~[mut 9]; check_sort(v1, v2); }
{ let mut v1 = ~[mut 9]; let v2 = ~[9]; check_sort(v1, v2); }
{
let v1 = ~[mut 9, 3, 3, 3, 9];
let v2 = ~[mut 3, 3, 3, 9, 9];
let mut v1 = ~[9, 3, 3, 3, 9];
let mut v2 = ~[3, 3, 3, 9, 9];
check_sort(v1, v2);
}
}

2
src/libsyntax/attr.rs
View file

@ -269,7 +269,7 @@ 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 v: ~[mut @ast::meta_item] = vec::cast_to_mut(items);
let mut v: ~[@ast::meta_item] = vec::cast_to_mut(items);
std::sort::quick_sort(v, lteq);
vec::cast_from_mut(move v)
}

6
src/libsyntax/print/pp.rs
View file

@ -148,9 +148,9 @@ pub fn mk_printer(out: io::Writer, linewidth: uint) -> printer {
// fall behind.
let n: uint = 3 * linewidth;
debug!("mk_printer %u", linewidth);
let token: ~[mut token] = vec::cast_to_mut(vec::from_elem(n, EOF));
let size: ~[mut int] = vec::cast_to_mut(vec::from_elem(n, 0));
let scan_stack: ~[mut uint] = vec::cast_to_mut(vec::from_elem(n, 0u));
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));
printer_(@{out: out,
buf_len: n,
mut margin: linewidth as int,

2
src/test/bench/graph500-bfs.rs
View file

@ -120,7 +120,7 @@ fn gen_search_keys(graph: graph, n: uint) -> ~[node_id] {
* Nodes that are unreachable have a parent of -1.
*/
fn bfs(graph: graph, key: node_id) -> bfs_result {
let marks : ~[mut node_id]
let mut marks : ~[node_id]
= vec::cast_to_mut(vec::from_elem(vec::len(graph), -1i64));
let Q = deque::create();

2
src/test/compile-fail/alt-vec-tail-move.rs
View file

@ -1,5 +1,5 @@
fn main() {
let a = [mut 1, 2, 3, 4];
let mut a = [1, 2, 3, 4];
let _ = match a {
[1, 2, ..move tail] => tail,
_ => core::util::unreachable()

6
src/test/compile-fail/borrowck-loan-vec-content.rs
View file

@ -17,13 +17,13 @@ fn takes_imm_elt(_v: &int, f: fn()) {
}
fn has_mut_vec_and_does_not_try_to_change_it() {
let v = ~[mut 1, 2, 3];
let mut v = ~[1, 2, 3];
do takes_imm_elt(&v[0]) {
}
}
fn has_mut_vec_but_tries_to_change_it() {
let v = ~[mut 1, 2, 3];
let mut v = ~[1, 2, 3];
do takes_imm_elt(&v[0]) { //~ NOTE loan of mutable vec content granted here
v[1] = 4; //~ ERROR assigning to mutable vec content prohibited due to outstanding loan
}
@ -34,7 +34,7 @@ fn takes_const_elt(_v: &const int, f: fn()) {
}
fn has_mut_vec_and_tries_to_change_it() {
let v = ~[mut 1, 2, 3];
let mut v = ~[1, 2, 3];
do takes_const_elt(&const v[0]) {
v[1] = 4;
}

2
src/test/compile-fail/lub-in-args.rs
View file

@ -11,7 +11,7 @@
fn two_args<T>(x: T, y: T) { }
fn main() {
let x: ~[mut int] = ~[mut 3];
let mut x: ~[mut int] = ~[3];
let y: ~[int] = ~[3];
let a: @mut int = @mut 3;
let b: @int = @3;

2
src/test/compile-fail/mutable-huh-variance-deep.rs
View file

@ -11,7 +11,7 @@
// error-pattern: mismatched types
fn main() {
let v = ~[mut @mut ~mut ~[0]];
let mut v = ~[@mut ~mut ~[0]];
fn f(&&v: ~[mut @mut ~mut ~[const int]]) {
}

2
src/test/compile-fail/mutable-huh-variance-vec1.rs
View file

@ -12,7 +12,7 @@ fn main() {
// Note: explicit type annot is required here
// because otherwise the inference gets smart
// and assigns a type of ~[mut ~[const int]].
let v: ~[mut ~[int]] = ~[mut ~[0]];
let mut v: ~[mut ~[int]] = ~[~[0]];
fn f(&&v: ~[mut ~[const int]]) {
v[0] = ~[mut 3]

2
src/test/compile-fail/mutable-huh-variance-vec2.rs
View file

@ -12,7 +12,7 @@ fn main() {
// Note: explicit type annot is required here
// because otherwise the inference gets smart
// and assigns a type of ~[mut ~[const int]].
let v: ~[mut ~[mut int]] = ~[mut ~[mut 0]];
let mut v: ~[mut ~[mut int]] = ~[mut ~[0]];
fn f(&&v: ~[mut ~[const int]]) {
v[0] = ~[3]

2
src/test/compile-fail/mutable-huh-variance-vec3.rs
View file

@ -12,7 +12,7 @@ fn main() {
// Note: explicit type annot is required here
// because otherwise the inference gets smart
// and assigns a type of ~[mut ~[const int]].
let v: ~[mut ~[mut ~[int]]] = ~[mut ~[mut ~[0]]];
let mut v: ~[mut ~[mut ~[int]]] = ~[mut ~[~[0]]];
fn f(&&v: ~[mut ~[mut ~[const int]]]) {
v[0][1] = ~[mut 3]

6
src/test/compile-fail/mutable-huh-variance-vec4.rs
View file

@ -13,9 +13,9 @@ fn main() {
// Note: here we do not have any type annotations
// but we do express conflicting requirements:
let v = ~[mut ~[0]];
let w = ~[mut ~[mut 0]];
let x = ~[mut ~[mut 0]];
let mut v = ~[~[0]];
let mut w = ~[mut ~[0]];
let mut x = ~[mut ~[0]];
fn f(&&v: ~[mut ~[int]]) {
v[0] = ~[3]

2
src/test/run-pass/empty-mutable-vec.rs
View file

@ -10,4 +10,4 @@
fn main() { let v: ~[mut int] = ~[mut]; }
fn main() { let mut v: ~[mut int] = ~[]; }

2
src/test/run-pass/explicit-self-objects-ext-1.rs
View file

@ -16,7 +16,7 @@ pub trait ReaderUtil {
impl<T: Reader> T : ReaderUtil {
fn read_bytes(&self, len: uint) {
let count = self.read(&[mut 0], len);
let mut count = self.read(&[0], len);
}
}

2
src/test/run-pass/explicit-self-objects-ext-2.rs
View file

@ -16,7 +16,7 @@ pub trait ReaderUtil {
impl<T: Reader> T : ReaderUtil {
fn read_bytes(&self, len: uint) {
let count = self.read(&[mut 0], len);
let mut count = self.read(&[0], len);
}
}

2
src/test/run-pass/explicit-self-objects-ext-3.rs
View file

@ -16,7 +16,7 @@ pub trait ReaderUtil {
impl<T: Reader> T : ReaderUtil {
fn read_bytes(len: uint) {
let count = self.read(&[mut 0], len);
let mut count = self.read(&[0], len);
}
}

2
src/test/run-pass/explicit-self-objects-ext-4.rs
View file

@ -16,7 +16,7 @@ pub trait ReaderUtil {
impl<T: Reader> T : ReaderUtil {
fn read_bytes(len: uint) {
let count = self.read(&[mut 0], len);
let mut count = self.read(&[0], len);
}
}

2
src/test/run-pass/foreach-nested.rs
View file

@ -15,7 +15,7 @@
fn two(it: fn(int)) { it(0); it(1); }
fn main() {
let a: ~[mut int] = ~[mut -1, -1, -1, -1];
let mut a: ~[mut int] = ~[-1, -1, -1, -1];
let mut p: int = 0;
do two |i| {
do two |j| { a[p] = 10 * i + j; p += 1; }

2
src/test/run-pass/impl-variance.rs
View file

@ -21,6 +21,6 @@ fn main() {
assert v.foo() == 1u;
let v = ~[0];
assert v.foo() == 1u;
let v = ~[mut 0];
let mut v = ~[0];
assert v.foo() == 1u;
}

2
src/test/run-pass/log-linearized.rs
View file

@ -20,7 +20,7 @@ struct Smallintmap<T> {mut v: ~[mut option<T>]}
struct V<T> { v: ~[mut option<T>] }
fn mk<T>() -> @Smallintmap<T> {
let v: ~[mut option<T>] = ~[mut];
let mut v: ~[mut option<T>] = ~[];
return @Smallintmap {mut v: move v};
}

2
src/test/run-pass/maybe-mutable.rs
View file

@ -21,6 +21,6 @@ fn len(v: ~[const int]) -> uint {
fn main() {
let v0 = ~[1, 2, 3, 4, 5];
log(debug, len(v0));
let v1 = ~[mut 1, 2, 3, 4, 5];
let mut v1 = ~[1, 2, 3, 4, 5];
log(debug, len(v1));
}

2
src/test/run-pass/mutable-vec-drop.rs
View file

@ -13,6 +13,6 @@ struct Pair { a: int, b: int}
fn main() {
// This just tests whether the vec leaks its members.
let pvec: ~[mut @Pair] =
let mut pvec: ~[@Pair] =
~[mut @Pair{a: 1, b: 2}, @Pair{a: 3, b: 4}, @Pair{a: 5, b: 6}];
}

2
src/test/run-pass/rcvr-borrowed-to-slice.rs
View file

@ -29,7 +29,7 @@ fn main() {
debug!("y==%d", y);
assert y == 6;
let x = ~[mut 1, 2, 3];
let mut x = ~[1, 2, 3];
let y = x.sum();
debug!("y==%d", y);
assert y == 6;

2
src/test/run-pass/sendfn-deep-copy.rs
View file

@ -13,7 +13,7 @@ fn main() { test05(); }
fn mk_counter<A:Copy>() -> fn~(A) -> (A,uint) {
// The only reason that the counter is generic is so that it closes
// over both a type descriptor and some data.
let v = ~[mut 0u];
let mut v = ~[0u];
return fn~(a: A) -> (A,uint) {
let n = v[0];
v[0] = n + 1u;

2
src/test/run-pass/swap-2.rs
View file

@ -11,7 +11,7 @@
fn swap<T>(v: &[mut T], i: int, j: int) { v[i] <-> v[j]; }
fn main() {
let a: ~[mut int] = ~[mut 0, 1, 2, 3, 4, 5, 6];
let mut a: ~[mut int] = ~[0, 1, 2, 3, 4, 5, 6];
swap(a, 2, 4);
assert (a[2] == 4);
assert (a[4] == 2);