Skip to content

Commit 1d3d052

Browse files
committed
---
yaml --- r: 11763 b: refs/heads/master c: 6d4fb35 h: refs/heads/master i: 11761: 3f31958 11759: 90851b6 v: v3
1 parent 8042bc1 commit 1d3d052

File tree

4 files changed

+33
-23
lines changed

4 files changed

+33
-23
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: a5368fb6d841a244ddd6fb7f983b90ac1ce0c9ef
2+
refs/heads/master: 6d4fb359120a603241195cf02251efb5f83787fa
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
55
refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/libcore/vec.rs

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ export zip;
5858
export swap;
5959
export reverse;
6060
export reversed;
61-
export enum_chars;
62-
export enum_uints;
6361
export iter;
6462
export iter2;
6563
export iteri;
@@ -734,26 +732,6 @@ fn reversed<T: copy>(v: [const T]) -> [T] {
734732
ret rs;
735733
}
736734

737-
// FIXME: Seems like this should take char params. Maybe belongs in char
738-
#[doc = "Returns a vector containing a range of chars"]
739-
fn enum_chars(start: u8, end: u8) -> [char] {
740-
assert start < end;
741-
let mut i = start;
742-
let mut r = [];
743-
while i <= end { r += [i as char]; i += 1u as u8; }
744-
ret r;
745-
}
746-
747-
// FIXME: Probably belongs in uint. Compare to uint::range
748-
#[doc = "Returns a vector containing a range of uints"]
749-
fn enum_uints(start: uint, end: uint) -> [uint] {
750-
assert start < end;
751-
let mut i = start;
752-
let mut r = [];
753-
while i <= end { r += [i]; i += 1u; }
754-
ret r;
755-
}
756-
757735
#[doc = "
758736
Iterates over a vector
759737

trunk/src/test/run-fail/zip-different-lengths.rs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,22 @@ import uint;
66
import u8;
77
import vec::*;
88

9+
fn enum_chars(start: u8, end: u8) -> [char] {
10+
assert start < end;
11+
let mut i = start;
12+
let mut r = [];
13+
while i <= end { r += [i as char]; i += 1u as u8; }
14+
ret r;
15+
}
16+
17+
fn enum_uints(start: uint, end: uint) -> [uint] {
18+
assert start < end;
19+
let mut i = start;
20+
let mut r = [];
21+
while i <= end { r += [i]; i += 1u; }
22+
ret r;
23+
}
24+
925
fn main() {
1026
let a = 'a' as u8, j = 'j' as u8, k = 1u, l = 9u;
1127
// Silly, but necessary

trunk/src/test/run-pass/zip-same-length.rs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,22 @@ import u8;
66

77
import vec::*;
88

9+
fn enum_chars(start: u8, end: u8) -> [char] {
10+
assert start < end;
11+
let mut i = start;
12+
let mut r = [];
13+
while i <= end { r += [i as char]; i += 1u as u8; }
14+
ret r;
15+
}
16+
17+
fn enum_uints(start: uint, end: uint) -> [uint] {
18+
assert start < end;
19+
let mut i = start;
20+
let mut r = [];
21+
while i <= end { r += [i]; i += 1u; }
22+
ret r;
23+
}
24+
925
fn main() {
1026
let a = 'a' as u8, j = 'j' as u8, k = 1u, l = 10u;
1127
// Silly, but necessary

0 commit comments

Comments
 (0)