mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

auto merge of : gifnksm/rust/windowed, r=brson

Browse Source 
vec::windowed fails if given window size is greater than vector length + 1.

```rust
for vec::windowed(7, &[1,2,3,4,5,6]) |vs| { fail!(); } // => do nothing
for vec::windowed(8, &[1,2,3,4,5,6]) |vs| { fail!(); } // => assertion failure in vec::slice
```
This commit is contained in:
bors 2013-04-19 22:12:52 -07:00
commit e67f1c0fd2
1 changed files with 3 additions and 0 deletions

3
src/libcore/vec.rs

@ -1542,6 +1542,7 @@ pub fn each_permutation<T:Copy>(v: &[T], put: &fn(ts: &[T]) -> bool) {
#[cfg(stage0)] // XXX: lifetimes! #[cfg(stage0)] // XXX: lifetimes!
pub fn windowed<T>(n: uint, v: &[T], it: &fn(&[T]) -> bool) { pub fn windowed<T>(n: uint, v: &[T], it: &fn(&[T]) -> bool) {
assert!(1u <= n); assert!(1u <= n);
if n > v.len() { return; }
for uint::range(0, v.len() - n + 1) |i| { for uint::range(0, v.len() - n + 1) |i| {
if !it(v.slice(i, i+n)) { return } if !it(v.slice(i, i+n)) { return }
} }
@ -1551,6 +1552,7 @@ pub fn windowed<T>(n: uint, v: &[T], it: &fn(&[T]) -> bool) {
#[cfg(stage3)] #[cfg(stage3)]
pub fn windowed<'r, T>(n: uint, v: &'r [T], it: &fn(&'r [T]) -> bool) { pub fn windowed<'r, T>(n: uint, v: &'r [T], it: &fn(&'r [T]) -> bool) {
assert!(1u <= n); assert!(1u <= n);
if n > v.len() { return; }
for uint::range(0, v.len() - n + 1) |i| { for uint::range(0, v.len() - n + 1) |i| {
if !it(v.slice(i, i + n)) { return } if !it(v.slice(i, i + n)) { return }
} }
@ -3910,6 +3912,7 @@ mod tests {
t(3, &[&[1,2,3],&[2,3,4],&[3,4,5],&[4,5,6]]); t(3, &[&[1,2,3],&[2,3,4],&[3,4,5],&[4,5,6]]);
t(4, &[&[1,2,3,4],&[2,3,4,5],&[3,4,5,6]]); t(4, &[&[1,2,3,4],&[2,3,4,5],&[3,4,5,6]]);
t(7, &[]); t(7, &[]);
t(8, &[]);
} }
#[test] #[test]