From dc07280b087c89506ad7e5f66f4f88b18d06be2e Mon Sep 17 00:00:00 2001 From: Niko Matsakis Date: Thu, 22 Mar 2012 08:39:41 -0700 Subject: make --enforce-mut-vars always on, add mut annotations to remaining files --- src/libstd/bitv.rs | 14 +++++++------- src/libstd/deque.rs | 2 +- src/libstd/map.rs | 4 ++-- src/libstd/rope.rs | 24 ++++++++++++------------ src/libstd/sha1.rs | 8 ++++---- src/libstd/sort.rs | 6 +++--- src/libstd/test.rs | 2 +- 7 files changed, 30 insertions(+), 30 deletions(-) (limited to 'src/libstd') diff --git a/src/libstd/bitv.rs b/src/libstd/bitv.rs index 4b79bf6c050..371f45cb7a9 100644 --- a/src/libstd/bitv.rs +++ b/src/libstd/bitv.rs @@ -234,8 +234,8 @@ fn eq_vec(v0: bitv, v1: [uint]) -> bool { mod tests { #[test] fn test_0_elements() { - let act; - let exp; + let mut act; + let mut exp; act = bitv(0u, false); exp = vec::from_elem::(0u, 0u); assert (eq_vec(act, exp)); @@ -243,7 +243,7 @@ mod tests { #[test] fn test_1_element() { - let act; + let mut act; act = bitv(1u, false); assert (eq_vec(act, [0u])); act = bitv(1u, true); @@ -252,7 +252,7 @@ mod tests { #[test] fn test_10_elements() { - let act; + let mut act; // all 0 act = bitv(10u, false); @@ -291,7 +291,7 @@ mod tests { #[test] fn test_31_elements() { - let act; + let mut act; // all 0 act = bitv(31u, false); @@ -364,7 +364,7 @@ mod tests { #[test] fn test_32_elements() { - let act; + let mut act; // all 0 act = bitv(32u, false); @@ -439,7 +439,7 @@ mod tests { #[test] fn test_33_elements() { - let act; + let mut act; // all 0 act = bitv(33u, false); diff --git a/src/libstd/deque.rs b/src/libstd/deque.rs index dc5b2a66edb..749cefc5ba6 100644 --- a/src/libstd/deque.rs +++ b/src/libstd/deque.rs @@ -126,7 +126,7 @@ mod tests { assert (d.peek_front() == 42); log(debug, d.peek_back()); assert (d.peek_back() == 137); - let i: int = d.pop_front(); + let mut i: int = d.pop_front(); log(debug, i); assert (i == 42); i = d.pop_back(); diff --git a/src/libstd/map.rs b/src/libstd/map.rs index 29d3579afa3..9ca7f346bda 100644 --- a/src/libstd/map.rs +++ b/src/libstd/map.rs @@ -453,7 +453,7 @@ mod tests { let eqer_uint: map::eqfn = eq_uint; let hm_uu: map::hashmap = map::hashmap::(hasher_uint, eqer_uint); - let i: uint = 0u; + let mut i: uint = 0u; while i < num_to_insert { assert (hm_uu.insert(i, i * i)); #debug("inserting %u -> %u", i, i*i); @@ -533,7 +533,7 @@ mod tests { let eqer: map::eqfn = eq; let hm: map::hashmap = map::hashmap::(hasher, eqer); - let i: uint = 0u; + let mut i: uint = 0u; while i < num_to_insert { assert (hm.insert(i, i * i)); #debug("inserting %u -> %u", i, i*i); diff --git a/src/libstd/rope.rs b/src/libstd/rope.rs index 982bfe36b03..e4438b77a00 100644 --- a/src/libstd/rope.rs +++ b/src/libstd/rope.rs @@ -1281,18 +1281,18 @@ mod tests { #[test] fn of_string2() { let buf = @ mutable "1234567890"; - let i = 0; + let mut i = 0; while i < 10 { *buf = *buf + *buf; i+=1;} let sample = @*buf; let r = of_str(sample); assert char_len(r) == str::char_len(*sample); assert rope_to_string(r) == *sample; - let string_iter = 0u; + let mut string_iter = 0u; let string_len = str::len(*sample); let rope_iter = iterator::char::start(r); - let equal = true; - let pos = 0u; + let mut equal = true; + let mut pos = 0u; while equal { alt(node::char_iterator::next(rope_iter)) { option::none { @@ -1314,12 +1314,12 @@ mod tests { #[test] fn iter1() { let buf = @ mutable "1234567890"; - let i = 0; + let mut i = 0; while i < 10 { *buf = *buf + *buf; i+=1;} let sample = @*buf; let r = of_str(sample); - let len = 0u; + let mut len = 0u; let it = iterator::char::start(r); loop { alt(node::char_iterator::next(it)) { @@ -1335,11 +1335,11 @@ mod tests { fn bal1() { let init = @ "1234567890"; let buf = @ mutable * init; - let i = 0; + let mut i = 0; while i < 8 { *buf = *buf + *buf; i+=1;} let sample = @*buf; let r1 = of_str(sample); - let r2 = of_str(init); + let mut r2 = of_str(init); i = 0; while i < 8 { r2 = append_rope(r2, r2); i+= 1;} @@ -1354,19 +1354,19 @@ mod tests { #[test] fn char_at1() { //Generate a large rope - let r = of_str(@ "123456789"); + let mut r = of_str(@ "123456789"); uint::range(0u, 10u){|_i| r = append_rope(r, r); } //Copy it in the slowest possible way - let r2 = empty(); + let mut r2 = empty(); uint::range(0u, char_len(r)){|i| r2 = append_char(r2, char_at(r, i)); } assert eq(r, r2); - let r3 = empty(); + let mut r3 = empty(); uint::range(0u, char_len(r)){|i| r3 = prepend_char(r3, char_at(r, char_len(r) - i - 1u)); } @@ -1387,7 +1387,7 @@ mod tests { fn concat1() { //Generate a reasonable rope let chunk = of_str(@ "123456789"); - let r = empty(); + let mut r = empty(); uint::range(0u, 10u){|_i| r = append_rope(r, chunk); } diff --git a/src/libstd/sha1.rs b/src/libstd/sha1.rs index d7deb7a3d06..4d5aabf705d 100644 --- a/src/libstd/sha1.rs +++ b/src/libstd/sha1.rs @@ -264,8 +264,8 @@ mod tests { type test = {input: str, output: [u8]}; fn a_million_letter_a() -> str { - let i = 0; - let rs = ""; + let mut i = 0; + let mut rs = ""; while i < 100000 { rs += "aaaaaaaaaa"; i += 1; } ret rs; } @@ -316,7 +316,7 @@ mod tests { fn check_vec_eq(v0: [u8], v1: [u8]) { assert (vec::len::(v0) == vec::len::(v1)); let len = vec::len::(v0); - let i = 0u; + let mut i = 0u; while i < len { let a = v0[i]; let b = v1[i]; @@ -338,7 +338,7 @@ mod tests { // Test that it works when accepting the message in pieces for t: test in tests { let len = str::len(t.input); - let left = len; + let mut left = len; while left > 0u { let take = (left + 1u) / 2u; sh.input_str(str::slice(t.input, len - left, diff --git a/src/libstd/sort.rs b/src/libstd/sort.rs index ce3982fb433..461dd1bab3a 100644 --- a/src/libstd/sort.rs +++ b/src/libstd/sort.rs @@ -167,7 +167,7 @@ mod test_qsort3 { let f1 = lt; let f2 = equal; quick_sort3::(f1, f2, v1); - let i = 0u; + let mut i = 0u; while i < len { log(debug, v2[i]); assert (v2[i] == v1[i]); @@ -208,7 +208,7 @@ mod test_qsort { fn leual(&&a: int, &&b: int) -> bool { ret a <= b; } let f = leual; quick_sort::(f, v1); - let i = 0u; + let mut i = 0u; while i < len { log(debug, v2[i]); assert (v2[i] == v1[i]); @@ -266,7 +266,7 @@ mod tests { fn le(&&a: int, &&b: int) -> bool { ret a <= b; } let f = le; let v3 = merge_sort::(f, v1); - let i = 0u; + let mut i = 0u; while i < len { log(debug, v3[i]); assert (v3[i] == v2[i]); diff --git a/src/libstd/test.rs b/src/libstd/test.rs index cb7d1cde0ef..271fac730ab 100644 --- a/src/libstd/test.rs +++ b/src/libstd/test.rs @@ -491,7 +491,7 @@ mod tests { let tests = { let testfn = fn~() { }; - let tests = []; + let mut tests = []; for name: str in names { let test = {name: name, fn: testfn, ignore: false, should_fail: false}; -- cgit 1.4.1-3-g733a5