diff options
| author | Graham Fawcett <fawcett@uwindsor.ca> | 2012-01-18 16:02:29 -0500 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-01-21 13:33:16 -0800 |
| commit | 7763b40c71372c6be7a65673a968f6174bab4209 (patch) | |
| tree | 9d8a08b5a3a6547bb6ebd9a0c5d4a82aff3ee871 /src/libstd | |
| parent | 35d12be2ce6f62ce75b4f59c2932415dc8b7b786 (diff) | |
issue #1352: change param order on vec::init_elt, putting block in final position.
To match the init_fn() and init_fn_mut() changes.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/bitv.rs | 4 | ||||
| -rw-r--r-- | src/libstd/deque.rs | 2 | ||||
| -rw-r--r-- | src/libstd/extfmt.rs | 2 | ||||
| -rw-r--r-- | src/libstd/freebsd_os.rs | 2 | ||||
| -rw-r--r-- | src/libstd/linux_os.rs | 2 | ||||
| -rw-r--r-- | src/libstd/macos_os.rs | 2 | ||||
| -rw-r--r-- | src/libstd/map.rs | 2 | ||||
| -rw-r--r-- | src/libstd/md4.rs | 2 | ||||
| -rw-r--r-- | src/libstd/rope.rs | 10 | ||||
| -rw-r--r-- | src/libstd/sha1.rs | 6 | ||||
| -rw-r--r-- | src/libstd/win32_os.rs | 2 |
11 files changed, 18 insertions, 18 deletions
diff --git a/src/libstd/bitv.rs b/src/libstd/bitv.rs index 8296398c9e6..59e6263f82f 100644 --- a/src/libstd/bitv.rs +++ b/src/libstd/bitv.rs @@ -49,7 +49,7 @@ init - If true then the bits are initialized to 1, otherwise 0 */ fn create(nbits: uint, init: bool) -> t { let elt = if init { !0u } else { 0u }; - let storage = vec::init_elt_mut::<uint>(elt, nbits / uint_bits + 1u); + let storage = vec::init_elt_mut::<uint>(nbits / uint_bits + 1u, elt); ret @{storage: storage, nbits: nbits}; } @@ -117,7 +117,7 @@ Function: clone Makes a copy of a bitvector */ fn clone(v: t) -> t { - let storage = vec::init_elt_mut::<uint>(0u, v.nbits / uint_bits + 1u); + let storage = vec::init_elt_mut::<uint>(v.nbits / uint_bits + 1u, 0u); let len = vec::len(v.storage); uint::range(0u, len) {|i| storage[i] = v.storage[i]; }; ret @{storage: storage, nbits: v.nbits}; diff --git a/src/libstd/deque.rs b/src/libstd/deque.rs index 5ab9a44cd1a..290b981306f 100644 --- a/src/libstd/deque.rs +++ b/src/libstd/deque.rs @@ -127,7 +127,7 @@ fn create<T: copy>() -> t<T> { mutable nelts: 0u, mutable lo: 0u, mutable hi: 0u, - mutable elts: vec::init_elt_mut(none, initial_capacity) + mutable elts: vec::init_elt_mut(initial_capacity, none) }; repr as t::<T> } diff --git a/src/libstd/extfmt.rs b/src/libstd/extfmt.rs index f5135ac8298..3e01d67bc55 100644 --- a/src/libstd/extfmt.rs +++ b/src/libstd/extfmt.rs @@ -380,7 +380,7 @@ mod rt { // FIXME: This might be useful in str: but needs to be utf8 safe first fn str_init_elt(c: char, n_elts: uint) -> str { - let svec = vec::init_elt::<u8>(c as u8, n_elts); + let svec = vec::init_elt::<u8>(n_elts, c as u8); ret str::unsafe_from_bytes(svec); } diff --git a/src/libstd/freebsd_os.rs b/src/libstd/freebsd_os.rs index 596db37bea9..847262ca10c 100644 --- a/src/libstd/freebsd_os.rs +++ b/src/libstd/freebsd_os.rs @@ -129,7 +129,7 @@ fn dylib_filename(base: str) -> str { ret "lib" + base + ".so"; } /// followed by a path separator fn get_exe_path() -> option::t<fs::path> unsafe { let bufsize = 1023u; - let path = str::unsafe_from_bytes(vec::init_elt(0u8, bufsize)); + let path = str::unsafe_from_bytes(vec::init_elt(bufsize, 0u8)); let mib = [libc_constants::CTL_KERN, libc_constants::KERN_PROC, libc_constants::KERN_PROC_PATHNAME, -1i32]; diff --git a/src/libstd/linux_os.rs b/src/libstd/linux_os.rs index 0dc31f11ab0..7bc0212c1c2 100644 --- a/src/libstd/linux_os.rs +++ b/src/libstd/linux_os.rs @@ -125,7 +125,7 @@ fn dylib_filename(base: str) -> str { ret "lib" + base + ".so"; } /// followed by a path separator fn get_exe_path() -> option::t<fs::path> { let bufsize = 1023u; - let path = str::unsafe_from_bytes(vec::init_elt(0u8, bufsize)); + let path = str::unsafe_from_bytes(vec::init_elt(bufsize, 0u8)); ret str::as_buf("/proc/self/exe", { |proc_self_buf| str::as_buf(path, { |path_buf| if libc::readlink(proc_self_buf, path_buf, bufsize) != -1 { diff --git a/src/libstd/macos_os.rs b/src/libstd/macos_os.rs index ad042b06c25..b72fc732379 100644 --- a/src/libstd/macos_os.rs +++ b/src/libstd/macos_os.rs @@ -134,7 +134,7 @@ fn dylib_filename(base: str) -> str { ret "lib" + base + ".dylib"; } fn get_exe_path() -> option::t<fs::path> { // FIXME: This doesn't handle the case where the buffer is too small let bufsize = 1023u32; - let path = str::unsafe_from_bytes(vec::init_elt(0u8, bufsize as uint)); + let path = str::unsafe_from_bytes(vec::init_elt(bufsize as uint, 0u8)); ret str::as_buf(path, { |path_buf| if mac_libc::_NSGetExecutablePath(path_buf, ptr::mut_addr_of(bufsize)) == 0i32 { diff --git a/src/libstd/map.rs b/src/libstd/map.rs index bbf3f888cf6..c3517d4d3f6 100644 --- a/src/libstd/map.rs +++ b/src/libstd/map.rs @@ -242,7 +242,7 @@ mod chained { } fn chains<K: copy, V: copy>(nchains: uint) -> [mutable chain<K,V>] { - ret vec::init_elt_mut(absent, nchains); + ret vec::init_elt_mut(nchains, absent); } fn foreach_entry<K: copy, V: copy>(chain0: chain<K,V>, diff --git a/src/libstd/md4.rs b/src/libstd/md4.rs index b6ef12842a1..d31f0cb524b 100644 --- a/src/libstd/md4.rs +++ b/src/libstd/md4.rs @@ -25,7 +25,7 @@ fn md4(msg: [u8]) -> {a: u32, b: u32, c: u32, d: u32} { } let i = 0u, e = vec::len(msg); - let x = vec::init_elt_mut(0u32, 16u); + let x = vec::init_elt_mut(16u, 0u32); while i < e { let aa = a, bb = b, cc = c, dd = d; diff --git a/src/libstd/rope.rs b/src/libstd/rope.rs index eb30897b1c0..9290bf8992e 100644 --- a/src/libstd/rope.rs +++ b/src/libstd/rope.rs @@ -181,7 +181,7 @@ fn concat(v: [rope]) -> rope { //Copy `v` into a mutable vector let len = vec::len(v); if len == 0u { ret node::empty; } - let ropes = vec::init_elt_mut(v[0], len); + let ropes = vec::init_elt_mut(len, v[0]); uint::range(1u, len) {|i| ropes[i] = v[i]; } @@ -779,7 +779,7 @@ mod node { //Firstly, split `str` in slices of hint_max_leaf_char_len let leaves = uint::div_ceil(char_len, hint_max_leaf_char_len); //Number of leaves - let nodes = vec::init_elt_mut(candidate, leaves); + let nodes = vec::init_elt_mut(leaves, candidate); let i = 0u; let offset = byte_start; @@ -892,7 +892,7 @@ mod node { } fn serialize_node(node: @node) -> str unsafe { - let buf = vec::init_elt_mut(0u8, byte_len(node)); + let buf = vec::init_elt_mut(byte_len(node), 0u8); let offset = 0u;//Current position in the buffer let it = leaf_iterator::start(node); while true { @@ -1223,7 +1223,7 @@ mod node { } fn start(node: @node) -> t { - let stack = vec::init_elt_mut(node, height(node)+1u); + let stack = vec::init_elt_mut(height(node)+1u, node); ret { stack: stack, mutable stackpos: 0 @@ -1490,7 +1490,7 @@ mod tests { } //Same rope, obtained with rope::concat - let r2 = concat(vec::init_elt(chunk, 10u)); + let r2 = concat(vec::init_elt(10u, chunk)); assert eq(r, r2); } diff --git a/src/libstd/sha1.rs b/src/libstd/sha1.rs index 17bb82a722b..e23737a6c3f 100644 --- a/src/libstd/sha1.rs +++ b/src/libstd/sha1.rs @@ -274,13 +274,13 @@ fn mk_sha1() -> sha1 { } } let st = { - h: vec::init_elt_mut(0u32, digest_buf_len), + h: vec::init_elt_mut(digest_buf_len, 0u32), mutable len_low: 0u32, mutable len_high: 0u32, - msg_block: vec::init_elt_mut(0u8, msg_block_len), + msg_block: vec::init_elt_mut(msg_block_len, 0u8), mutable msg_block_idx: 0u, mutable computed: false, - work_buf: vec::init_elt_mut(0u32, work_buf_len) + work_buf: vec::init_elt_mut(work_buf_len, 0u32) }; let sh = st as sha1; sh.reset(); diff --git a/src/libstd/win32_os.rs b/src/libstd/win32_os.rs index ff45648cdba..949c818a7ed 100644 --- a/src/libstd/win32_os.rs +++ b/src/libstd/win32_os.rs @@ -114,7 +114,7 @@ fn getcwd() -> str { ret rustrt::rust_getcwd(); } fn get_exe_path() -> option::t<fs::path> { // FIXME: This doesn't handle the case where the buffer is too small let bufsize = 1023u; - let path = str::unsafe_from_bytes(vec::init_elt(0u8, bufsize)); + let path = str::unsafe_from_bytes(vec::init_elt(bufsize, 0u8)); ret str::as_buf(path, { |path_buf| if kernel32::GetModuleFileNameA(0u, path_buf, bufsize as u32) != 0u32 { |
