auto merge of #6487 : recrack/rust/vec_len, r=thestinger
Rename vec::len(var) to var.len() ``` libcore, libfuzzer, librustc, librustdoc, libstd, libsyntax test/auxiliary test/bench test/run-pass ```
This commit is contained in:
commit
4e82610099
58 changed files with 128 additions and 134 deletions
|
|
@ -13,7 +13,7 @@
|
|||
#[inline]
|
||||
pub fn iter<T>(v: &[T], f: &fn(&T)) {
|
||||
let mut i = 0u;
|
||||
let n = vec::len(v);
|
||||
let n = v.len();
|
||||
while i < n {
|
||||
f(&v[i]);
|
||||
i += 1u;
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
// same as cci_iter_lib, more-or-less, but not marked inline
|
||||
pub fn iter(v: ~[uint], f: &fn(uint)) {
|
||||
let mut i = 0u;
|
||||
let n = vec::len(v);
|
||||
let n = v.len();
|
||||
while i < n {
|
||||
f(v[i]);
|
||||
i += 1u;
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@ fn gen_search_keys(graph: &[~[node_id]], n: uint) -> ~[node_id] {
|
|||
*/
|
||||
fn bfs(graph: graph, key: node_id) -> bfs_result {
|
||||
let mut marks : ~[node_id]
|
||||
= vec::from_elem(vec::len(graph), -1i64);
|
||||
= vec::from_elem(graph.len(), -1i64);
|
||||
|
||||
let mut q = Deque::new();
|
||||
|
||||
|
|
@ -429,7 +429,7 @@ fn main() {
|
|||
let stop = time::precise_time_s();
|
||||
|
||||
io::stdout().write_line(fmt!("Generated %? edges in %? seconds.",
|
||||
vec::len(edges), stop - start));
|
||||
edges.len(), stop - start));
|
||||
|
||||
let start = time::precise_time_s();
|
||||
let graph = make_graph(1 << scale, copy edges);
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ fn windows_with_carry(bb: &[u8], nn: uint,
|
|||
it: &fn(window: &[u8])) -> ~[u8] {
|
||||
let mut ii = 0u;
|
||||
|
||||
let len = vec::len(bb);
|
||||
let len = bb.len();
|
||||
while ii < len - (nn - 1u) {
|
||||
it(vec::slice(bb, ii, ii+nn));
|
||||
ii += 1u;
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ pub impl Sudoku {
|
|||
let line = reader.read_line();
|
||||
let mut comps = ~[];
|
||||
for str::each_split_char(line.trim(), ',') |s| { comps.push(s.to_owned()) }
|
||||
if vec::len(comps) == 3u {
|
||||
if comps.len() == 3u {
|
||||
let row = uint::from_str(comps[0]).get() as u8;
|
||||
let col = uint::from_str(comps[1]).get() as u8;
|
||||
g[row][col] = uint::from_str(comps[2]).get() as u8;
|
||||
|
|
@ -103,7 +103,7 @@ pub impl Sudoku {
|
|||
}
|
||||
|
||||
let mut ptr = 0u;
|
||||
let end = vec::len(work);
|
||||
let end = work.len();
|
||||
while (ptr < end) {
|
||||
let (row, col) = work[ptr];
|
||||
// is there another color to try?
|
||||
|
|
@ -265,7 +265,7 @@ fn check_default_sudoku_solution() {
|
|||
|
||||
fn main() {
|
||||
let args = os::args();
|
||||
let use_default = vec::len(args) == 1u;
|
||||
let use_default = args.len() == 1u;
|
||||
let mut sudoku = if use_default {
|
||||
Sudoku::from_vec(&default_sudoku)
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -39,15 +39,15 @@ pub fn main() {
|
|||
// Call a method
|
||||
for x.iterate() |y| { assert!(x[*y] == *y); }
|
||||
// Call a parameterized function
|
||||
assert!(length(x.clone()) == vec::len(x));
|
||||
assert!(length(x.clone()) == x.len());
|
||||
// Call a parameterized function, with type arguments that require
|
||||
// a borrow
|
||||
assert!(length::<int, &[int]>(x) == vec::len(x));
|
||||
assert!(length::<int, &[int]>(x) == x.len());
|
||||
|
||||
// Now try it with a type that *needs* to be borrowed
|
||||
let z = [0,1,2,3];
|
||||
// Call a method
|
||||
for z.iterate() |y| { assert!(z[*y] == *y); }
|
||||
// Call a parameterized function
|
||||
assert!(length::<int, &[int]>(z) == vec::len(z));
|
||||
assert!(length::<int, &[int]>(z) == z.len());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ fn annoy_neighbors<T:noisy>(critter: T) {
|
|||
|
||||
fn bite_everything<T:bitey>(critter: T) -> bool {
|
||||
let mut left : ~[body_part] = ~[finger, toe, nose, ear];
|
||||
while vec::len(left) > 0u {
|
||||
while left.len() > 0u {
|
||||
let part = critter.bite();
|
||||
debug!("%? %?", left, part);
|
||||
if vec_includes(left, part) {
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ mod map_reduce {
|
|||
|
||||
start_mappers(ctrl_chan, inputs.clone());
|
||||
|
||||
let mut num_mappers = vec::len(inputs) as int;
|
||||
let mut num_mappers = inputs.len() as int;
|
||||
|
||||
while num_mappers > 0 {
|
||||
match ctrl_port.recv() {
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ fn test_heap_to_heap() {
|
|||
// a spills onto the heap
|
||||
let mut a = ~[0, 1, 2, 3, 4];
|
||||
a = a + a; // FIXME(#3387)---can't write a += a
|
||||
assert!((vec::len(a) == 10u));
|
||||
assert!(a.len() == 10u);
|
||||
assert!((a[0] == 0));
|
||||
assert!((a[1] == 1));
|
||||
assert!((a[2] == 2));
|
||||
|
|
@ -32,7 +32,7 @@ fn test_stack_to_heap() {
|
|||
let mut a = ~[0, 1, 2];
|
||||
// a spills to the heap
|
||||
a = a + a; // FIXME(#3387)---can't write a += a
|
||||
assert!((vec::len(a) == 6u));
|
||||
assert!(a.len() == 6u);
|
||||
assert!((a[0] == 0));
|
||||
assert!((a[1] == 1));
|
||||
assert!((a[2] == 2));
|
||||
|
|
@ -47,8 +47,8 @@ fn test_loop() {
|
|||
let mut i = 20;
|
||||
let mut expected_len = 1u;
|
||||
while i > 0 {
|
||||
error!(vec::len(a));
|
||||
assert!((vec::len(a) == expected_len));
|
||||
error!(a.len());
|
||||
assert!(a.len() == expected_len);
|
||||
a = a + a; // FIXME(#3387)---can't write a += a
|
||||
i -= 1;
|
||||
expected_len *= 2u;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue