Skip to content

Commit 7a52b12

Browse files
bstriebrson
bstrie
authored and
brson
committed
---
yaml --- r: 36029 b: refs/heads/try2 c: ac81fff h: refs/heads/master i: 36027: 94d186f v: v3
1 parent 7e09ef8 commit 7a52b12

34 files changed

+136
-152
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
55
refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 4174688dd48f4967e08c0aecc7a2a90dc28a56da
8+
refs/heads/try2: ac81fff22926d464f7a90f14c4c8f846569e75e0
99
refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
1010
refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

‎branches/try2/src/libcore/hash.rs

Lines changed: 68 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ struct SipState {
156156
mut v1: u64,
157157
mut v2: u64,
158158
mut v3: u64,
159-
tail: [mut u8]/8, // unprocessed bytes
159+
tail: [mut u8 * 8], // unprocessed bytes
160160
mut ntail: uint, // how many bytes in tail are valid
161161
}
162162

@@ -359,72 +359,72 @@ impl &SipState : Streaming {
359359

360360
#[test]
361361
pub fn test_siphash() {
362-
let vecs : [[u8]/8]/64 = [
363-
[ 0x31, 0x0e, 0x0e, 0xdd, 0x47, 0xdb, 0x6f, 0x72, ]/_,
364-
[ 0xfd, 0x67, 0xdc, 0x93, 0xc5, 0x39, 0xf8, 0x74, ]/_,
365-
[ 0x5a, 0x4f, 0xa9, 0xd9, 0x09, 0x80, 0x6c, 0x0d, ]/_,
366-
[ 0x2d, 0x7e, 0xfb, 0xd7, 0x96, 0x66, 0x67, 0x85, ]/_,
367-
[ 0xb7, 0x87, 0x71, 0x27, 0xe0, 0x94, 0x27, 0xcf, ]/_,
368-
[ 0x8d, 0xa6, 0x99, 0xcd, 0x64, 0x55, 0x76, 0x18, ]/_,
369-
[ 0xce, 0xe3, 0xfe, 0x58, 0x6e, 0x46, 0xc9, 0xcb, ]/_,
370-
[ 0x37, 0xd1, 0x01, 0x8b, 0xf5, 0x00, 0x02, 0xab, ]/_,
371-
[ 0x62, 0x24, 0x93, 0x9a, 0x79, 0xf5, 0xf5, 0x93, ]/_,
372-
[ 0xb0, 0xe4, 0xa9, 0x0b, 0xdf, 0x82, 0x00, 0x9e, ]/_,
373-
[ 0xf3, 0xb9, 0xdd, 0x94, 0xc5, 0xbb, 0x5d, 0x7a, ]/_,
374-
[ 0xa7, 0xad, 0x6b, 0x22, 0x46, 0x2f, 0xb3, 0xf4, ]/_,
375-
[ 0xfb, 0xe5, 0x0e, 0x86, 0xbc, 0x8f, 0x1e, 0x75, ]/_,
376-
[ 0x90, 0x3d, 0x84, 0xc0, 0x27, 0x56, 0xea, 0x14, ]/_,
377-
[ 0xee, 0xf2, 0x7a, 0x8e, 0x90, 0xca, 0x23, 0xf7, ]/_,
378-
[ 0xe5, 0x45, 0xbe, 0x49, 0x61, 0xca, 0x29, 0xa1, ]/_,
379-
[ 0xdb, 0x9b, 0xc2, 0x57, 0x7f, 0xcc, 0x2a, 0x3f, ]/_,
380-
[ 0x94, 0x47, 0xbe, 0x2c, 0xf5, 0xe9, 0x9a, 0x69, ]/_,
381-
[ 0x9c, 0xd3, 0x8d, 0x96, 0xf0, 0xb3, 0xc1, 0x4b, ]/_,
382-
[ 0xbd, 0x61, 0x79, 0xa7, 0x1d, 0xc9, 0x6d, 0xbb, ]/_,
383-
[ 0x98, 0xee, 0xa2, 0x1a, 0xf2, 0x5c, 0xd6, 0xbe, ]/_,
384-
[ 0xc7, 0x67, 0x3b, 0x2e, 0xb0, 0xcb, 0xf2, 0xd0, ]/_,
385-
[ 0x88, 0x3e, 0xa3, 0xe3, 0x95, 0x67, 0x53, 0x93, ]/_,
386-
[ 0xc8, 0xce, 0x5c, 0xcd, 0x8c, 0x03, 0x0c, 0xa8, ]/_,
387-
[ 0x94, 0xaf, 0x49, 0xf6, 0xc6, 0x50, 0xad, 0xb8, ]/_,
388-
[ 0xea, 0xb8, 0x85, 0x8a, 0xde, 0x92, 0xe1, 0xbc, ]/_,
389-
[ 0xf3, 0x15, 0xbb, 0x5b, 0xb8, 0x35, 0xd8, 0x17, ]/_,
390-
[ 0xad, 0xcf, 0x6b, 0x07, 0x63, 0x61, 0x2e, 0x2f, ]/_,
391-
[ 0xa5, 0xc9, 0x1d, 0xa7, 0xac, 0xaa, 0x4d, 0xde, ]/_,
392-
[ 0x71, 0x65, 0x95, 0x87, 0x66, 0x50, 0xa2, 0xa6, ]/_,
393-
[ 0x28, 0xef, 0x49, 0x5c, 0x53, 0xa3, 0x87, 0xad, ]/_,
394-
[ 0x42, 0xc3, 0x41, 0xd8, 0xfa, 0x92, 0xd8, 0x32, ]/_,
395-
[ 0xce, 0x7c, 0xf2, 0x72, 0x2f, 0x51, 0x27, 0x71, ]/_,
396-
[ 0xe3, 0x78, 0x59, 0xf9, 0x46, 0x23, 0xf3, 0xa7, ]/_,
397-
[ 0x38, 0x12, 0x05, 0xbb, 0x1a, 0xb0, 0xe0, 0x12, ]/_,
398-
[ 0xae, 0x97, 0xa1, 0x0f, 0xd4, 0x34, 0xe0, 0x15, ]/_,
399-
[ 0xb4, 0xa3, 0x15, 0x08, 0xbe, 0xff, 0x4d, 0x31, ]/_,
400-
[ 0x81, 0x39, 0x62, 0x29, 0xf0, 0x90, 0x79, 0x02, ]/_,
401-
[ 0x4d, 0x0c, 0xf4, 0x9e, 0xe5, 0xd4, 0xdc, 0xca, ]/_,
402-
[ 0x5c, 0x73, 0x33, 0x6a, 0x76, 0xd8, 0xbf, 0x9a, ]/_,
403-
[ 0xd0, 0xa7, 0x04, 0x53, 0x6b, 0xa9, 0x3e, 0x0e, ]/_,
404-
[ 0x92, 0x59, 0x58, 0xfc, 0xd6, 0x42, 0x0c, 0xad, ]/_,
405-
[ 0xa9, 0x15, 0xc2, 0x9b, 0xc8, 0x06, 0x73, 0x18, ]/_,
406-
[ 0x95, 0x2b, 0x79, 0xf3, 0xbc, 0x0a, 0xa6, 0xd4, ]/_,
407-
[ 0xf2, 0x1d, 0xf2, 0xe4, 0x1d, 0x45, 0x35, 0xf9, ]/_,
408-
[ 0x87, 0x57, 0x75, 0x19, 0x04, 0x8f, 0x53, 0xa9, ]/_,
409-
[ 0x10, 0xa5, 0x6c, 0xf5, 0xdf, 0xcd, 0x9a, 0xdb, ]/_,
410-
[ 0xeb, 0x75, 0x09, 0x5c, 0xcd, 0x98, 0x6c, 0xd0, ]/_,
411-
[ 0x51, 0xa9, 0xcb, 0x9e, 0xcb, 0xa3, 0x12, 0xe6, ]/_,
412-
[ 0x96, 0xaf, 0xad, 0xfc, 0x2c, 0xe6, 0x66, 0xc7, ]/_,
413-
[ 0x72, 0xfe, 0x52, 0x97, 0x5a, 0x43, 0x64, 0xee, ]/_,
414-
[ 0x5a, 0x16, 0x45, 0xb2, 0x76, 0xd5, 0x92, 0xa1, ]/_,
415-
[ 0xb2, 0x74, 0xcb, 0x8e, 0xbf, 0x87, 0x87, 0x0a, ]/_,
416-
[ 0x6f, 0x9b, 0xb4, 0x20, 0x3d, 0xe7, 0xb3, 0x81, ]/_,
417-
[ 0xea, 0xec, 0xb2, 0xa3, 0x0b, 0x22, 0xa8, 0x7f, ]/_,
418-
[ 0x99, 0x24, 0xa4, 0x3c, 0xc1, 0x31, 0x57, 0x24, ]/_,
419-
[ 0xbd, 0x83, 0x8d, 0x3a, 0xaf, 0xbf, 0x8d, 0xb7, ]/_,
420-
[ 0x0b, 0x1a, 0x2a, 0x32, 0x65, 0xd5, 0x1a, 0xea, ]/_,
421-
[ 0x13, 0x50, 0x79, 0xa3, 0x23, 0x1c, 0xe6, 0x60, ]/_,
422-
[ 0x93, 0x2b, 0x28, 0x46, 0xe4, 0xd7, 0x06, 0x66, ]/_,
423-
[ 0xe1, 0x91, 0x5f, 0x5c, 0xb1, 0xec, 0xa4, 0x6c, ]/_,
424-
[ 0xf3, 0x25, 0x96, 0x5c, 0xa1, 0x6d, 0x62, 0x9f, ]/_,
425-
[ 0x57, 0x5f, 0xf2, 0x8e, 0x60, 0x38, 0x1b, 0xe5, ]/_,
426-
[ 0x72, 0x45, 0x06, 0xeb, 0x4c, 0x32, 0x8a, 0x95, ]/_
427-
]/_;
362+
let vecs : [[u8 * 8] * 64] = [
363+
[ 0x31, 0x0e, 0x0e, 0xdd, 0x47, 0xdb, 0x6f, 0x72, ],
364+
[ 0xfd, 0x67, 0xdc, 0x93, 0xc5, 0x39, 0xf8, 0x74, ],
365+
[ 0x5a, 0x4f, 0xa9, 0xd9, 0x09, 0x80, 0x6c, 0x0d, ],
366+
[ 0x2d, 0x7e, 0xfb, 0xd7, 0x96, 0x66, 0x67, 0x85, ],
367+
[ 0xb7, 0x87, 0x71, 0x27, 0xe0, 0x94, 0x27, 0xcf, ],
368+
[ 0x8d, 0xa6, 0x99, 0xcd, 0x64, 0x55, 0x76, 0x18, ],
369+
[ 0xce, 0xe3, 0xfe, 0x58, 0x6e, 0x46, 0xc9, 0xcb, ],
370+
[ 0x37, 0xd1, 0x01, 0x8b, 0xf5, 0x00, 0x02, 0xab, ],
371+
[ 0x62, 0x24, 0x93, 0x9a, 0x79, 0xf5, 0xf5, 0x93, ],
372+
[ 0xb0, 0xe4, 0xa9, 0x0b, 0xdf, 0x82, 0x00, 0x9e, ],
373+
[ 0xf3, 0xb9, 0xdd, 0x94, 0xc5, 0xbb, 0x5d, 0x7a, ],
374+
[ 0xa7, 0xad, 0x6b, 0x22, 0x46, 0x2f, 0xb3, 0xf4, ],
375+
[ 0xfb, 0xe5, 0x0e, 0x86, 0xbc, 0x8f, 0x1e, 0x75, ],
376+
[ 0x90, 0x3d, 0x84, 0xc0, 0x27, 0x56, 0xea, 0x14, ],
377+
[ 0xee, 0xf2, 0x7a, 0x8e, 0x90, 0xca, 0x23, 0xf7, ],
378+
[ 0xe5, 0x45, 0xbe, 0x49, 0x61, 0xca, 0x29, 0xa1, ],
379+
[ 0xdb, 0x9b, 0xc2, 0x57, 0x7f, 0xcc, 0x2a, 0x3f, ],
380+
[ 0x94, 0x47, 0xbe, 0x2c, 0xf5, 0xe9, 0x9a, 0x69, ],
381+
[ 0x9c, 0xd3, 0x8d, 0x96, 0xf0, 0xb3, 0xc1, 0x4b, ],
382+
[ 0xbd, 0x61, 0x79, 0xa7, 0x1d, 0xc9, 0x6d, 0xbb, ],
383+
[ 0x98, 0xee, 0xa2, 0x1a, 0xf2, 0x5c, 0xd6, 0xbe, ],
384+
[ 0xc7, 0x67, 0x3b, 0x2e, 0xb0, 0xcb, 0xf2, 0xd0, ],
385+
[ 0x88, 0x3e, 0xa3, 0xe3, 0x95, 0x67, 0x53, 0x93, ],
386+
[ 0xc8, 0xce, 0x5c, 0xcd, 0x8c, 0x03, 0x0c, 0xa8, ],
387+
[ 0x94, 0xaf, 0x49, 0xf6, 0xc6, 0x50, 0xad, 0xb8, ],
388+
[ 0xea, 0xb8, 0x85, 0x8a, 0xde, 0x92, 0xe1, 0xbc, ],
389+
[ 0xf3, 0x15, 0xbb, 0x5b, 0xb8, 0x35, 0xd8, 0x17, ],
390+
[ 0xad, 0xcf, 0x6b, 0x07, 0x63, 0x61, 0x2e, 0x2f, ],
391+
[ 0xa5, 0xc9, 0x1d, 0xa7, 0xac, 0xaa, 0x4d, 0xde, ],
392+
[ 0x71, 0x65, 0x95, 0x87, 0x66, 0x50, 0xa2, 0xa6, ],
393+
[ 0x28, 0xef, 0x49, 0x5c, 0x53, 0xa3, 0x87, 0xad, ],
394+
[ 0x42, 0xc3, 0x41, 0xd8, 0xfa, 0x92, 0xd8, 0x32, ],
395+
[ 0xce, 0x7c, 0xf2, 0x72, 0x2f, 0x51, 0x27, 0x71, ],
396+
[ 0xe3, 0x78, 0x59, 0xf9, 0x46, 0x23, 0xf3, 0xa7, ],
397+
[ 0x38, 0x12, 0x05, 0xbb, 0x1a, 0xb0, 0xe0, 0x12, ],
398+
[ 0xae, 0x97, 0xa1, 0x0f, 0xd4, 0x34, 0xe0, 0x15, ],
399+
[ 0xb4, 0xa3, 0x15, 0x08, 0xbe, 0xff, 0x4d, 0x31, ],
400+
[ 0x81, 0x39, 0x62, 0x29, 0xf0, 0x90, 0x79, 0x02, ],
401+
[ 0x4d, 0x0c, 0xf4, 0x9e, 0xe5, 0xd4, 0xdc, 0xca, ],
402+
[ 0x5c, 0x73, 0x33, 0x6a, 0x76, 0xd8, 0xbf, 0x9a, ],
403+
[ 0xd0, 0xa7, 0x04, 0x53, 0x6b, 0xa9, 0x3e, 0x0e, ],
404+
[ 0x92, 0x59, 0x58, 0xfc, 0xd6, 0x42, 0x0c, 0xad, ],
405+
[ 0xa9, 0x15, 0xc2, 0x9b, 0xc8, 0x06, 0x73, 0x18, ],
406+
[ 0x95, 0x2b, 0x79, 0xf3, 0xbc, 0x0a, 0xa6, 0xd4, ],
407+
[ 0xf2, 0x1d, 0xf2, 0xe4, 0x1d, 0x45, 0x35, 0xf9, ],
408+
[ 0x87, 0x57, 0x75, 0x19, 0x04, 0x8f, 0x53, 0xa9, ],
409+
[ 0x10, 0xa5, 0x6c, 0xf5, 0xdf, 0xcd, 0x9a, 0xdb, ],
410+
[ 0xeb, 0x75, 0x09, 0x5c, 0xcd, 0x98, 0x6c, 0xd0, ],
411+
[ 0x51, 0xa9, 0xcb, 0x9e, 0xcb, 0xa3, 0x12, 0xe6, ],
412+
[ 0x96, 0xaf, 0xad, 0xfc, 0x2c, 0xe6, 0x66, 0xc7, ],
413+
[ 0x72, 0xfe, 0x52, 0x97, 0x5a, 0x43, 0x64, 0xee, ],
414+
[ 0x5a, 0x16, 0x45, 0xb2, 0x76, 0xd5, 0x92, 0xa1, ],
415+
[ 0xb2, 0x74, 0xcb, 0x8e, 0xbf, 0x87, 0x87, 0x0a, ],
416+
[ 0x6f, 0x9b, 0xb4, 0x20, 0x3d, 0xe7, 0xb3, 0x81, ],
417+
[ 0xea, 0xec, 0xb2, 0xa3, 0x0b, 0x22, 0xa8, 0x7f, ],
418+
[ 0x99, 0x24, 0xa4, 0x3c, 0xc1, 0x31, 0x57, 0x24, ],
419+
[ 0xbd, 0x83, 0x8d, 0x3a, 0xaf, 0xbf, 0x8d, 0xb7, ],
420+
[ 0x0b, 0x1a, 0x2a, 0x32, 0x65, 0xd5, 0x1a, 0xea, ],
421+
[ 0x13, 0x50, 0x79, 0xa3, 0x23, 0x1c, 0xe6, 0x60, ],
422+
[ 0x93, 0x2b, 0x28, 0x46, 0xe4, 0xd7, 0x06, 0x66, ],
423+
[ 0xe1, 0x91, 0x5f, 0x5c, 0xb1, 0xec, 0xa4, 0x6c, ],
424+
[ 0xf3, 0x25, 0x96, 0x5c, 0xa1, 0x6d, 0x62, 0x9f, ],
425+
[ 0x57, 0x5f, 0xf2, 0x8e, 0x60, 0x38, 0x1b, 0xe5, ],
426+
[ 0x72, 0x45, 0x06, 0xeb, 0x4c, 0x32, 0x8a, 0x95, ]
427+
];
428428

429429
let k0 = 0x_07_06_05_04_03_02_01_00_u64;
430430
let k1 = 0x_0f_0e_0d_0c_0b_0a_09_08_u64;
@@ -433,7 +433,7 @@ pub fn test_siphash() {
433433
let stream_inc = &State(k0,k1);
434434
let stream_full = &State(k0,k1);
435435

436-
fn to_hex_str(r: &[u8]/8) -> ~str {
436+
fn to_hex_str(r: &[u8 * 8]) -> ~str {
437437
let mut s = ~"";
438438
for vec::each(*r) |b| {
439439
s += uint::to_str(*b as uint, 16u);

‎branches/try2/src/libcore/pipes.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -667,7 +667,7 @@ pub fn select2<A: Send, Ab: Send, B: Send, Bb: Send>(
667667
-> Either<(Option<A>, RecvPacketBuffered<B, Bb>),
668668
(RecvPacketBuffered<A, Ab>, Option<B>)>
669669
{
670-
let i = wait_many([a.header(), b.header()]/_);
670+
let i = wait_many([a.header(), b.header()]);
671671

672672
match i {
673673
0 => Left((try_recv(move a), move b)),
@@ -693,7 +693,7 @@ pub fn selecti<T: Selectable>(endpoints: &[T]) -> uint {
693693
/// Returns 0 or 1 depending on which endpoint is ready to receive
694694
pub fn select2i<A: Selectable, B: Selectable>(a: &A, b: &B) ->
695695
Either<(), ()> {
696-
match wait_many([a.header(), b.header()]/_) {
696+
match wait_many([a.header(), b.header()]) {
697697
0 => Left(()),
698698
1 => Right(()),
699699
_ => fail ~"wait returned unexpected index"

‎branches/try2/src/libcore/uint-template.rs

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -187,19 +187,7 @@ pub pure fn to_str_bytes<U>(neg: bool, num: T, radix: uint,
187187
// Enough room to hold any number in any radix.
188188
// Worst case: 64-bit number, binary-radix, with
189189
// a leading negative sign = 65 bytes.
190-
let buf : [mut u8]/65 =
191-
[mut
192-
0u8,0u8,0u8,0u8,0u8, 0u8,0u8,0u8,0u8,0u8,
193-
0u8,0u8,0u8,0u8,0u8, 0u8,0u8,0u8,0u8,0u8,
194-
195-
0u8,0u8,0u8,0u8,0u8, 0u8,0u8,0u8,0u8,0u8,
196-
0u8,0u8,0u8,0u8,0u8, 0u8,0u8,0u8,0u8,0u8,
197-
198-
0u8,0u8,0u8,0u8,0u8, 0u8,0u8,0u8,0u8,0u8,
199-
0u8,0u8,0u8,0u8,0u8, 0u8,0u8,0u8,0u8,0u8,
200-
201-
0u8,0u8,0u8,0u8,0u8
202-
]/65;
190+
let buf : [mut u8 * 65] = [mut 0u8, ..65];
203191

204192
// FIXME (#2649): post-snapshot, you can do this without the raw
205193
// pointers and unsafe bits, and the codegen will prove it's all

‎branches/try2/src/libstd/arena.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ fn test_arena_destructors() {
244244
do arena.alloc { @i };
245245
// Allocate something with funny size and alignment, to keep
246246
// things interesting.
247-
do arena.alloc { [0u8, 1u8, 2u8]/3 };
247+
do arena.alloc { [0u8, 1u8, 2u8] };
248248
}
249249
}
250250

@@ -258,7 +258,7 @@ fn test_arena_destructors_fail() {
258258
do arena.alloc { @i };
259259
// Allocate something with funny size and alignment, to keep
260260
// things interesting.
261-
do arena.alloc { [0u8, 1u8, 2u8]/3 };
261+
do arena.alloc { [0u8, 1u8, 2u8] };
262262
}
263263
// Now, fail while allocating
264264
do arena.alloc::<@int> {

‎branches/try2/src/libsyntax/ast.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ impl proto : cmp::Eq {
462462
#[auto_deserialize]
463463
enum vstore {
464464
// FIXME (#3469): Change uint to @expr (actually only constant exprs)
465-
vstore_fixed(Option<uint>), // [1,2,3,4]/_ or 4
465+
vstore_fixed(Option<uint>), // [1,2,3,4]
466466
vstore_uniq, // ~[1,2,3,4]
467467
vstore_box, // @[1,2,3,4]
468468
vstore_slice(@region) // &[1,2,3,4](foo)?
@@ -472,7 +472,8 @@ enum vstore {
472472
#[auto_deserialize]
473473
enum expr_vstore {
474474
// FIXME (#3469): Change uint to @expr (actually only constant exprs)
475-
expr_vstore_fixed(Option<uint>), // [1,2,3,4]/_ or 4
475+
expr_vstore_fixed(Option<uint>), // [1,2,3,4]
476+
>>>>>>> Remove old fixed-length vector syntax
476477
expr_vstore_uniq, // ~[1,2,3,4]
477478
expr_vstore_box, // @[1,2,3,4]
478479
expr_vstore_slice // &[1,2,3,4]

‎branches/try2/src/libsyntax/parse/parser.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -207,12 +207,7 @@ fn Parser(sess: parse_sess, cfg: ast::crate_cfg,
207207
token: tok0.tok,
208208
span: span0,
209209
last_span: span0,
210-
buffer: [mut
211-
{tok: tok0.tok, sp: span0},
212-
{tok: tok0.tok, sp: span0},
213-
{tok: tok0.tok, sp: span0},
214-
{tok: tok0.tok, sp: span0}
215-
]/4,
210+
buffer: [mut {tok: tok0.tok, sp: span0}, ..4],
216211
buffer_start: 0,
217212
buffer_end: 0,
218213
restriction: UNRESTRICTED,
@@ -231,7 +226,7 @@ struct Parser {
231226
mut token: token::Token,
232227
mut span: span,
233228
mut last_span: span,
234-
mut buffer: [mut {tok: token::Token, sp: span}]/4,
229+
mut buffer: [mut {tok: token::Token, sp: span} * 4],
235230
mut buffer_start: int,
236231
mut buffer_end: int,
237232
mut restriction: restriction,

‎branches/try2/src/rustc/driver/rustc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ fn monitor(+f: fn~(diagnostic::emitter)) {
233233
~"try running with RUST_LOG=rustc=0,::rt::backtrace \
234234
to get further details and report the results \
235235
to github.com/mozilla/rust/issues"
236-
]/_.each |note| {
236+
].each |note| {
237237
diagnostic::emit(None, *note, diagnostic::note)
238238
}
239239
}

‎branches/try2/src/rustc/middle/const_eval.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use ast::*;
1919
// target uses". This _includes_ integer-constants, plus the following
2020
// constructors:
2121
//
22-
// fixed-size vectors and strings: []/_ and ""/_
22+
// fixed-size vectors and strings: [] and ""/_
2323
// vector and string slices: &[] and &""
2424
// tuples: (,)
2525
// records: {...}

‎branches/try2/src/rustc/middle/trans/common.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1310,13 +1310,13 @@ fn dummy_substs(tps: ~[ty::t]) -> ty::substs {
13101310
tps: tps}
13111311
}
13121312

1313-
fn struct_field(index: uint) -> [uint]/3 {
1313+
fn struct_field(index: uint) -> [uint * 3] {
13141314
//! The GEPi sequence to access a field of a record/struct.
13151315
13161316
[0, 0, index]
13171317
}
13181318

1319-
fn struct_dtor() -> [uint]/2 {
1319+
fn struct_dtor() -> [uint * 2] {
13201320
//! The GEPi sequence to access the dtor of a struct.
13211321
13221322
[0, 1]

‎branches/try2/src/rustc/middle/trans/tvec.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ fn trans_fixed_vstore(bcx: block,
140140
{
141141
//!
142142
//
143-
// [...]/_ allocates a fixed-size array and moves it around "by value".
143+
// [...] allocates a fixed-size array and moves it around "by value".
144144
// In this case, it means that the caller has already given us a location
145145
// to store the array of the suitable size, so all we have to do is
146146
// generate the content.

‎branches/try2/src/rustc/middle/typeck/check.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1019,7 +1019,7 @@ fn check_expr_with_unifier(fcx: @fn_ctxt,
10191019
// functions. This is so that we have more information about the types
10201020
// of arguments when we typecheck the functions. This isn't really the
10211021
// right way to do this.
1022-
for [false, true]/_.each |check_blocks| {
1022+
for [false, true].each |check_blocks| {
10231023
let check_blocks = *check_blocks;
10241024
debug!("check_blocks=%b", check_blocks);
10251025

‎branches/try2/src/test/compile-fail/evec-subtyping.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
fn wants_box(x: @[uint]) { }
22
fn wants_uniq(x: ~[uint]) { }
3-
fn wants_three(x: [uint]/3) { }
3+
fn wants_three(x: [uint * 3]) { }
44

55
fn has_box(x: @[uint]) {
66
wants_box(x);
@@ -14,13 +14,13 @@ fn has_uniq(x: ~[uint]) {
1414
wants_three(x); //~ ERROR [] storage differs: expected 3 but found ~
1515
}
1616

17-
fn has_three(x: [uint]/3) {
17+
fn has_three(x: [uint * 3]) {
1818
wants_box(x); //~ ERROR [] storage differs: expected @ but found 3
1919
wants_uniq(x); //~ ERROR [] storage differs: expected ~ but found 3
2020
wants_three(x);
2121
}
2222

23-
fn has_four(x: [uint]/4) {
23+
fn has_four(x: [uint * 4]) {
2424
wants_box(x); //~ ERROR [] storage differs: expected @ but found 4
2525
wants_uniq(x); //~ ERROR [] storage differs: expected ~ but found 4
2626
wants_three(x); //~ ERROR [] storage differs: expected 3 but found 4

‎branches/try2/src/test/run-pass/assignability-trait.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ fn main() {
3939
assert length::<int, &[int]>(x) == vec::len(x);
4040

4141
// Now try it with a type that *needs* to be borrowed
42-
let z = [0,1,2,3]/_;
42+
let z = [0,1,2,3];
4343
// Call a method
4444
for z.iterate() |y| { assert z[*y] == *y; }
4545
// Call a parameterized function

‎branches/try2/src/test/run-pass/borrowck-fixed-length-vecs.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
fn main() {
2-
let x = [22]/1;
2+
let x = [22];
33
let y = &x[0];
44
assert *y == 22;
5-
}
5+
}

‎branches/try2/src/test/run-pass/const-fields-and-indexing.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const x : [int]/4 = [1,2,3,4];
1+
const x : [int * 4] = [1,2,3,4];
22
const p : int = x[2];
33
const y : &[int] = &[1,2,3,4];
44
const q : int = y[2];
@@ -17,4 +17,4 @@ fn main() {
1717
assert p == 3;
1818
assert q == 3;
1919
assert t == 20;
20-
}
20+
}

‎branches/try2/src/test/run-pass/const-vecs-and-slices.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const x : [int]/4 = [1,2,3,4];
1+
const x : [int * 4] = [1,2,3,4];
22
const y : &[int] = &[1,2,3,4];
33

44
fn main() {
@@ -7,4 +7,4 @@ fn main() {
77
assert x[1] == 2;
88
assert x[3] == 4;
99
assert x[3] == y[3];
10-
}
10+
}

‎branches/try2/src/test/run-pass/evec-internal-boxes.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
fn main() {
2-
let x : [@int]/5 = [@1,@2,@3,@4,@5]/5;
3-
let _y : [@int]/5 = [@1,@2,@3,@4,@5]/_;
4-
let mut z = [@1,@2,@3,@4,@5]/_;
2+
let x : [@int * 5] = [@1,@2,@3,@4,@5];
3+
let _y : [@int * 5] = [@1,@2,@3,@4,@5];
4+
let mut z = [@1,@2,@3,@4,@5];
55
z = x;
66
assert *z[0] == 1;
77
assert *z[4] == 5;

0 commit comments

Comments
 (0)