diff options
| author | Daniel Micay <danielmicay@gmail.com> | 2014-03-30 23:53:26 -0400 |
|---|---|---|
| committer | Daniel Micay <danielmicay@gmail.com> | 2014-03-31 01:13:48 -0400 |
| commit | cbbc1fc843a0bea0191f66b76ff6fcc9005d7b0f (patch) | |
| tree | 8ae67254c54ac66f5f74a1418e67326b39458d56 /src/libterm | |
| parent | 612e22e417b41326b2060416892c7b16d921e20b (diff) | |
| download | rust-cbbc1fc843a0bea0191f66b76ff6fcc9005d7b0f.tar.gz rust-cbbc1fc843a0bea0191f66b76ff6fcc9005d7b0f.zip | |
vec: convert `append` and `append_one` to methods
These were only free functions on `~[T]` because taking self by-value used to be broken.
Diffstat (limited to 'src/libterm')
| -rw-r--r-- | src/libterm/terminfo/parm.rs | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/libterm/terminfo/parm.rs b/src/libterm/terminfo/parm.rs index a638a074271..b80297174d8 100644 --- a/src/libterm/terminfo/parm.rs +++ b/src/libterm/terminfo/parm.rs @@ -598,10 +598,8 @@ mod test { assert!(res.is_err(), "Op {} succeeded incorrectly with 0 stack entries", *cap); let p = if *cap == "%s" || *cap == "%l" { String(~"foo") } else { Number(97) }; - let res = expand(vec::append(bytes!("%p1").iter() - .map(|x| *x) - .collect(), - cap.as_bytes()).as_slice(), + let res = expand(bytes!("%p1").iter().map(|x| *x).collect::<Vec<_>>() + .append(cap.as_bytes()).as_slice(), [p], vars); assert!(res.is_ok(), @@ -612,18 +610,14 @@ mod test { let res = expand(cap.as_bytes(), [], vars); assert!(res.is_err(), "Binop {} succeeded incorrectly with 0 stack entries", *cap); - let res = expand(vec::append(bytes!("%{1}").iter() - .map(|x| *x) - .collect(), - cap.as_bytes()).as_slice(), + let res = expand(bytes!("%{1}").iter().map(|x| *x).collect::<Vec<_>>() + .append(cap.as_bytes()).as_slice(), [], vars); assert!(res.is_err(), "Binop {} succeeded incorrectly with 1 stack entry", *cap); - let res = expand(vec::append(bytes!("%{1}%{2}").iter() - .map(|x| *x) - .collect(), - cap.as_bytes()).as_slice(), + let res = expand(bytes!("%{1}%{2}").iter().map(|x| *x).collect::<Vec<_>>() + .append(cap.as_bytes()).as_slice(), [], vars); assert!(res.is_ok(), |