From 1f45dda9d2944a90e1dfa9599d030cbfb4f927b7 Mon Sep 17 00:00:00 2001 From: Marijn Haverbeke Date: Thu, 5 May 2011 20:17:44 +0200 Subject: Remove 'deprecated mutable...' from our code This should make compilation a bit less noisy. --- src/lib/UFind.rs | 4 ++-- src/lib/_str.rs | 2 +- src/lib/_u8.rs | 2 +- src/lib/_vec.rs | 8 ++++---- src/lib/bitv.rs | 12 ++++++------ src/lib/deque.rs | 2 +- src/lib/io.rs | 8 ++++---- src/lib/linux_os.rs | 4 ++-- src/lib/sha1.rs | 6 +++--- 9 files changed, 24 insertions(+), 24 deletions(-) (limited to 'src/lib') diff --git a/src/lib/UFind.rs b/src/lib/UFind.rs index 64cd56b0..9593e787 100644 --- a/src/lib/UFind.rs +++ b/src/lib/UFind.rs @@ -8,12 +8,12 @@ type ufind = rec(mutable vec[mutable node] nodes); fn make() -> ufind { let vec[mutable node] v = vec(mutable none[uint]); - _vec.pop[mutable node](v); // FIXME: botch + _vec.pop(v); // FIXME: botch ret rec(mutable nodes=v); } fn make_set(&ufind ufnd) -> uint { - auto idx = _vec.len[mutable node](ufnd.nodes); + auto idx = _vec.len(ufnd.nodes); ufnd.nodes += vec(mutable none[uint]); ret idx; } diff --git a/src/lib/_str.rs b/src/lib/_str.rs index ed2027e1..5239afb1 100644 --- a/src/lib/_str.rs +++ b/src/lib/_str.rs @@ -142,7 +142,7 @@ fn unsafe_from_bytes(vec[mutable? u8] v) -> str { // FIXME even temp-er thing; rustc can use "unsafe_from_bytes" above fn unsafe_from_mutable_bytes(vec[mutable u8] mv) -> str { let vec[u8] v = vec(); - for (mutable u8 b in mv) { + for (u8 b in mv) { v += vec(b); } ret rustrt.str_from_vec(v); diff --git a/src/lib/_u8.rs b/src/lib/_u8.rs index fa2a79e3..e094e581 100644 --- a/src/lib/_u8.rs +++ b/src/lib/_u8.rs @@ -11,7 +11,7 @@ fn ne(u8 x, u8 y) -> bool { ret x != y; } fn ge(u8 x, u8 y) -> bool { ret x >= y; } fn gt(u8 x, u8 y) -> bool { ret x > y; } -iter range(mutable u8 lo, u8 hi) -> u8 { +iter range(u8 lo, u8 hi) -> u8 { while (lo < hi) { put lo; lo += 1u8; diff --git a/src/lib/_vec.rs b/src/lib/_vec.rs index 4761a867..3a197ac2 100644 --- a/src/lib/_vec.rs +++ b/src/lib/_vec.rs @@ -190,7 +190,7 @@ fn unshift[T](&mutable array[T] v, &T t) { v = res; } -fn grow[T](&mutable array[T] v, uint n, &T initval) { +fn grow[T](&array[T] v, uint n, &T initval) { let uint i = n; while (i > 0u) { i -= 1u; @@ -198,10 +198,10 @@ fn grow[T](&mutable array[T] v, uint n, &T initval) { } } -fn grow_set[T](&mutable vec[mutable T] v, uint index, &T initval, &T val) { - auto length = _vec.len[mutable T](v); +fn grow_set[T](&vec[mutable T] v, uint index, &T initval, &T val) { + auto length = _vec.len(v); if (index >= length) { - grow[mutable T](v, index - length + 1u, initval); + grow(v, index - length + 1u, initval); } v.(index) = val; } diff --git a/src/lib/bitv.rs b/src/lib/bitv.rs index f52b016b..1002abc8 100644 --- a/src/lib/bitv.rs +++ b/src/lib/bitv.rs @@ -26,9 +26,9 @@ fn create(uint nbits, bool init) -> t { } fn process(&fn(uint, uint) -> uint op, &t v0, &t v1) -> bool { - auto len = _vec.len[mutable uint](v1.storage); + auto len = _vec.len(v1.storage); - assert (_vec.len[mutable uint](v0.storage) == len); + assert (_vec.len(v0.storage) == len); assert (v0.nbits == v1.nbits); auto changed = false; @@ -76,7 +76,7 @@ fn copy(&t v0, t v1) -> bool { fn clone(t v) -> t { auto storage = _vec.init_elt_mut[uint](0u, v.nbits / uint_bits() + 1u); - auto len = _vec.len[mutable uint](v.storage); + auto len = _vec.len(v.storage); for each (uint i in _uint.range(0u, len)) { storage.(i) = v.storage.(i); } @@ -97,7 +97,7 @@ fn get(&t v, uint i) -> bool { fn equal(&t v0, &t v1) -> bool { // FIXME: when we can break or return from inside an iterator loop, // we can eliminate this painful while-loop - auto len = _vec.len[mutable uint](v1.storage); + auto len = _vec.len(v1.storage); auto i = 0u; while (i < len) { if (v0.storage.(i) != v1.storage.(i)) { @@ -109,13 +109,13 @@ fn equal(&t v0, &t v1) -> bool { } fn clear(&t v) { - for each (uint i in _uint.range(0u, _vec.len[mutable uint](v.storage))) { + for each (uint i in _uint.range(0u, _vec.len(v.storage))) { v.storage.(i) = 0u; } } fn invert(&t v) { - for each (uint i in _uint.range(0u, _vec.len[mutable uint](v.storage))) { + for each (uint i in _uint.range(0u, _vec.len(v.storage))) { v.storage.(i) = ~v.storage.(i); } } diff --git a/src/lib/deque.rs b/src/lib/deque.rs index ee706ae7..b8404a7d 100644 --- a/src/lib/deque.rs +++ b/src/lib/deque.rs @@ -19,7 +19,7 @@ type t[T] = obj { fn create[T]() -> t[T] { - type cell[T] = mutable option.t[T]; + type cell[T] = option.t[T]; let uint initial_capacity = 32u; // 2^5 diff --git a/src/lib/io.rs b/src/lib/io.rs index 7d59da30..364810ba 100644 --- a/src/lib/io.rs +++ b/src/lib/io.rs @@ -451,7 +451,7 @@ type mutable_byte_buf = @rec(mutable vec[mutable u8] buf, mutable uint pos); state obj byte_buf_writer(mutable_byte_buf buf) { fn write(vec[u8] v) { // Fast path. - if (buf.pos == _vec.len[mutable u8](buf.buf)) { + if (buf.pos == _vec.len(buf.buf)) { // FIXME: Fix our type system. There's no reason you shouldn't be // able to add a mutable vector to an immutable one. auto mv = _vec.rustrt.unsafe_vec_to_mut[u8](v); @@ -465,7 +465,7 @@ state obj byte_buf_writer(mutable_byte_buf buf) { auto vpos = 0u; while (vpos < vlen) { auto b = v.(vpos); - if (buf.pos == _vec.len[mutable u8](buf.buf)) { + if (buf.pos == _vec.len(buf.buf)) { buf.buf += vec(mutable b); } else { buf.buf.(buf.pos) = b; @@ -477,7 +477,7 @@ state obj byte_buf_writer(mutable_byte_buf buf) { fn seek(int offset, seek_style whence) { auto pos = buf.pos; - auto len = _vec.len[mutable u8](buf.buf); + auto len = _vec.len(buf.buf); buf.pos = seek_in_buf(offset, pos, len, whence); } @@ -487,7 +487,7 @@ state obj byte_buf_writer(mutable_byte_buf buf) { fn string_writer() -> str_writer { // FIXME: yikes, this is bad. Needs fixing of mutable syntax. let vec[mutable u8] b = vec(mutable 0u8); - _vec.pop[mutable u8](b); + _vec.pop(b); let mutable_byte_buf buf = @rec(mutable buf = b, mutable pos = 0u); state obj str_writer_wrap(writer wr, mutable_byte_buf buf) { diff --git a/src/lib/linux_os.rs b/src/lib/linux_os.rs index d2a8ff97..a37db418 100644 --- a/src/lib/linux_os.rs +++ b/src/lib/linux_os.rs @@ -66,7 +66,7 @@ fn dylib_filename(str base) -> str { fn pipe() -> tup(int, int) { let vec[mutable int] fds = vec(mutable 0, 0); - assert (os.libc.pipe(_vec.buf[mutable int](fds)) == 0); + assert (os.libc.pipe(_vec.buf(fds)) == 0); ret tup(fds.(0), fds.(1)); } @@ -76,7 +76,7 @@ fn fd_FILE(int fd) -> libc.FILE { fn waitpid(int pid) -> int { let vec[mutable int] status = vec(mutable 0); - assert (os.libc.waitpid(pid, _vec.buf[mutable int](status), 0) != -1); + assert (os.libc.waitpid(pid, _vec.buf(status), 0) != -1); ret status.(0); } diff --git a/src/lib/sha1.rs b/src/lib/sha1.rs index 690489db..e84787a2 100644 --- a/src/lib/sha1.rs +++ b/src/lib/sha1.rs @@ -67,7 +67,7 @@ fn mk_sha1() -> sha1 { fn process_msg_block(&sha1state st) { // FIXME: Make precondition - assert (_vec.len[mutable u32](st.h) == digest_buf_len); + assert (_vec.len(st.h) == digest_buf_len); // Constants auto k = vec(0x5A827999u32, @@ -192,7 +192,7 @@ fn mk_sha1() -> sha1 { */ fn pad_msg(&sha1state st) { // FIXME: Should be a precondition - assert (_vec.len[mutable u8](st.msg_block) == msg_block_len); + assert (_vec.len(st.msg_block) == msg_block_len); /* * Check to see if the current message block is too small to hold @@ -236,7 +236,7 @@ fn mk_sha1() -> sha1 { fn reset() { // FIXME: Should be typestate precondition - assert (_vec.len[mutable u32](st.h) == digest_buf_len); + assert (_vec.len(st.h) == digest_buf_len); st.len_low = 0u32; st.len_high = 0u32; -- cgit v1.2.3