Remove old fixed-length vector syntax
This commit is contained in:
Ben Striegel
Brian Anderson
parent
4174688dd4
commit
ac81fff229
33 changed files with 135 additions and 151 deletions
|
|
@ -156,7 +156,7 @@ struct SipState {
|
|||
mut v1: u64,
|
||||
mut v2: u64,
|
||||
mut v3: u64,
|
||||
tail: [mut u8]/8, // unprocessed bytes
|
||||
tail: [mut u8 * 8], // unprocessed bytes
|
||||
mut ntail: uint, // how many bytes in tail are valid
|
||||
}
|
||||
|
||||
|
|
@ -359,72 +359,72 @@ impl &SipState : Streaming {
|
|||
|
||||
#[test]
|
||||
pub fn test_siphash() {
|
||||
let vecs : [[u8]/8]/64 = [
|
||||
[ 0x31, 0x0e, 0x0e, 0xdd, 0x47, 0xdb, 0x6f, 0x72, ]/_,
|
||||
[ 0xfd, 0x67, 0xdc, 0x93, 0xc5, 0x39, 0xf8, 0x74, ]/_,
|
||||
[ 0x5a, 0x4f, 0xa9, 0xd9, 0x09, 0x80, 0x6c, 0x0d, ]/_,
|
||||
[ 0x2d, 0x7e, 0xfb, 0xd7, 0x96, 0x66, 0x67, 0x85, ]/_,
|
||||
[ 0xb7, 0x87, 0x71, 0x27, 0xe0, 0x94, 0x27, 0xcf, ]/_,
|
||||
[ 0x8d, 0xa6, 0x99, 0xcd, 0x64, 0x55, 0x76, 0x18, ]/_,
|
||||
[ 0xce, 0xe3, 0xfe, 0x58, 0x6e, 0x46, 0xc9, 0xcb, ]/_,
|
||||
[ 0x37, 0xd1, 0x01, 0x8b, 0xf5, 0x00, 0x02, 0xab, ]/_,
|
||||
[ 0x62, 0x24, 0x93, 0x9a, 0x79, 0xf5, 0xf5, 0x93, ]/_,
|
||||
[ 0xb0, 0xe4, 0xa9, 0x0b, 0xdf, 0x82, 0x00, 0x9e, ]/_,
|
||||
[ 0xf3, 0xb9, 0xdd, 0x94, 0xc5, 0xbb, 0x5d, 0x7a, ]/_,
|
||||
[ 0xa7, 0xad, 0x6b, 0x22, 0x46, 0x2f, 0xb3, 0xf4, ]/_,
|
||||
[ 0xfb, 0xe5, 0x0e, 0x86, 0xbc, 0x8f, 0x1e, 0x75, ]/_,
|
||||
[ 0x90, 0x3d, 0x84, 0xc0, 0x27, 0x56, 0xea, 0x14, ]/_,
|
||||
[ 0xee, 0xf2, 0x7a, 0x8e, 0x90, 0xca, 0x23, 0xf7, ]/_,
|
||||
[ 0xe5, 0x45, 0xbe, 0x49, 0x61, 0xca, 0x29, 0xa1, ]/_,
|
||||
[ 0xdb, 0x9b, 0xc2, 0x57, 0x7f, 0xcc, 0x2a, 0x3f, ]/_,
|
||||
[ 0x94, 0x47, 0xbe, 0x2c, 0xf5, 0xe9, 0x9a, 0x69, ]/_,
|
||||
[ 0x9c, 0xd3, 0x8d, 0x96, 0xf0, 0xb3, 0xc1, 0x4b, ]/_,
|
||||
[ 0xbd, 0x61, 0x79, 0xa7, 0x1d, 0xc9, 0x6d, 0xbb, ]/_,
|
||||
[ 0x98, 0xee, 0xa2, 0x1a, 0xf2, 0x5c, 0xd6, 0xbe, ]/_,
|
||||
[ 0xc7, 0x67, 0x3b, 0x2e, 0xb0, 0xcb, 0xf2, 0xd0, ]/_,
|
||||
[ 0x88, 0x3e, 0xa3, 0xe3, 0x95, 0x67, 0x53, 0x93, ]/_,
|
||||
[ 0xc8, 0xce, 0x5c, 0xcd, 0x8c, 0x03, 0x0c, 0xa8, ]/_,
|
||||
[ 0x94, 0xaf, 0x49, 0xf6, 0xc6, 0x50, 0xad, 0xb8, ]/_,
|
||||
[ 0xea, 0xb8, 0x85, 0x8a, 0xde, 0x92, 0xe1, 0xbc, ]/_,
|
||||
[ 0xf3, 0x15, 0xbb, 0x5b, 0xb8, 0x35, 0xd8, 0x17, ]/_,
|
||||
[ 0xad, 0xcf, 0x6b, 0x07, 0x63, 0x61, 0x2e, 0x2f, ]/_,
|
||||
[ 0xa5, 0xc9, 0x1d, 0xa7, 0xac, 0xaa, 0x4d, 0xde, ]/_,
|
||||
[ 0x71, 0x65, 0x95, 0x87, 0x66, 0x50, 0xa2, 0xa6, ]/_,
|
||||
[ 0x28, 0xef, 0x49, 0x5c, 0x53, 0xa3, 0x87, 0xad, ]/_,
|
||||
[ 0x42, 0xc3, 0x41, 0xd8, 0xfa, 0x92, 0xd8, 0x32, ]/_,
|
||||
[ 0xce, 0x7c, 0xf2, 0x72, 0x2f, 0x51, 0x27, 0x71, ]/_,
|
||||
[ 0xe3, 0x78, 0x59, 0xf9, 0x46, 0x23, 0xf3, 0xa7, ]/_,
|
||||
[ 0x38, 0x12, 0x05, 0xbb, 0x1a, 0xb0, 0xe0, 0x12, ]/_,
|
||||
[ 0xae, 0x97, 0xa1, 0x0f, 0xd4, 0x34, 0xe0, 0x15, ]/_,
|
||||
[ 0xb4, 0xa3, 0x15, 0x08, 0xbe, 0xff, 0x4d, 0x31, ]/_,
|
||||
[ 0x81, 0x39, 0x62, 0x29, 0xf0, 0x90, 0x79, 0x02, ]/_,
|
||||
[ 0x4d, 0x0c, 0xf4, 0x9e, 0xe5, 0xd4, 0xdc, 0xca, ]/_,
|
||||
[ 0x5c, 0x73, 0x33, 0x6a, 0x76, 0xd8, 0xbf, 0x9a, ]/_,
|
||||
[ 0xd0, 0xa7, 0x04, 0x53, 0x6b, 0xa9, 0x3e, 0x0e, ]/_,
|
||||
[ 0x92, 0x59, 0x58, 0xfc, 0xd6, 0x42, 0x0c, 0xad, ]/_,
|
||||
[ 0xa9, 0x15, 0xc2, 0x9b, 0xc8, 0x06, 0x73, 0x18, ]/_,
|
||||
[ 0x95, 0x2b, 0x79, 0xf3, 0xbc, 0x0a, 0xa6, 0xd4, ]/_,
|
||||
[ 0xf2, 0x1d, 0xf2, 0xe4, 0x1d, 0x45, 0x35, 0xf9, ]/_,
|
||||
[ 0x87, 0x57, 0x75, 0x19, 0x04, 0x8f, 0x53, 0xa9, ]/_,
|
||||
[ 0x10, 0xa5, 0x6c, 0xf5, 0xdf, 0xcd, 0x9a, 0xdb, ]/_,
|
||||
[ 0xeb, 0x75, 0x09, 0x5c, 0xcd, 0x98, 0x6c, 0xd0, ]/_,
|
||||
[ 0x51, 0xa9, 0xcb, 0x9e, 0xcb, 0xa3, 0x12, 0xe6, ]/_,
|
||||
[ 0x96, 0xaf, 0xad, 0xfc, 0x2c, 0xe6, 0x66, 0xc7, ]/_,
|
||||
[ 0x72, 0xfe, 0x52, 0x97, 0x5a, 0x43, 0x64, 0xee, ]/_,
|
||||
[ 0x5a, 0x16, 0x45, 0xb2, 0x76, 0xd5, 0x92, 0xa1, ]/_,
|
||||
[ 0xb2, 0x74, 0xcb, 0x8e, 0xbf, 0x87, 0x87, 0x0a, ]/_,
|
||||
[ 0x6f, 0x9b, 0xb4, 0x20, 0x3d, 0xe7, 0xb3, 0x81, ]/_,
|
||||
[ 0xea, 0xec, 0xb2, 0xa3, 0x0b, 0x22, 0xa8, 0x7f, ]/_,
|
||||
[ 0x99, 0x24, 0xa4, 0x3c, 0xc1, 0x31, 0x57, 0x24, ]/_,
|
||||
[ 0xbd, 0x83, 0x8d, 0x3a, 0xaf, 0xbf, 0x8d, 0xb7, ]/_,
|
||||
[ 0x0b, 0x1a, 0x2a, 0x32, 0x65, 0xd5, 0x1a, 0xea, ]/_,
|
||||
[ 0x13, 0x50, 0x79, 0xa3, 0x23, 0x1c, 0xe6, 0x60, ]/_,
|
||||
[ 0x93, 0x2b, 0x28, 0x46, 0xe4, 0xd7, 0x06, 0x66, ]/_,
|
||||
[ 0xe1, 0x91, 0x5f, 0x5c, 0xb1, 0xec, 0xa4, 0x6c, ]/_,
|
||||
[ 0xf3, 0x25, 0x96, 0x5c, 0xa1, 0x6d, 0x62, 0x9f, ]/_,
|
||||
[ 0x57, 0x5f, 0xf2, 0x8e, 0x60, 0x38, 0x1b, 0xe5, ]/_,
|
||||
[ 0x72, 0x45, 0x06, 0xeb, 0x4c, 0x32, 0x8a, 0x95, ]/_
|
||||
]/_;
|
||||
let vecs : [[u8 * 8] * 64] = [
|
||||
[ 0x31, 0x0e, 0x0e, 0xdd, 0x47, 0xdb, 0x6f, 0x72, ],
|
||||
[ 0xfd, 0x67, 0xdc, 0x93, 0xc5, 0x39, 0xf8, 0x74, ],
|
||||
[ 0x5a, 0x4f, 0xa9, 0xd9, 0x09, 0x80, 0x6c, 0x0d, ],
|
||||
[ 0x2d, 0x7e, 0xfb, 0xd7, 0x96, 0x66, 0x67, 0x85, ],
|
||||
[ 0xb7, 0x87, 0x71, 0x27, 0xe0, 0x94, 0x27, 0xcf, ],
|
||||
[ 0x8d, 0xa6, 0x99, 0xcd, 0x64, 0x55, 0x76, 0x18, ],
|
||||
[ 0xce, 0xe3, 0xfe, 0x58, 0x6e, 0x46, 0xc9, 0xcb, ],
|
||||
[ 0x37, 0xd1, 0x01, 0x8b, 0xf5, 0x00, 0x02, 0xab, ],
|
||||
[ 0x62, 0x24, 0x93, 0x9a, 0x79, 0xf5, 0xf5, 0x93, ],
|
||||
[ 0xb0, 0xe4, 0xa9, 0x0b, 0xdf, 0x82, 0x00, 0x9e, ],
|
||||
[ 0xf3, 0xb9, 0xdd, 0x94, 0xc5, 0xbb, 0x5d, 0x7a, ],
|
||||
[ 0xa7, 0xad, 0x6b, 0x22, 0x46, 0x2f, 0xb3, 0xf4, ],
|
||||
[ 0xfb, 0xe5, 0x0e, 0x86, 0xbc, 0x8f, 0x1e, 0x75, ],
|
||||
[ 0x90, 0x3d, 0x84, 0xc0, 0x27, 0x56, 0xea, 0x14, ],
|
||||
[ 0xee, 0xf2, 0x7a, 0x8e, 0x90, 0xca, 0x23, 0xf7, ],
|
||||
[ 0xe5, 0x45, 0xbe, 0x49, 0x61, 0xca, 0x29, 0xa1, ],
|
||||
[ 0xdb, 0x9b, 0xc2, 0x57, 0x7f, 0xcc, 0x2a, 0x3f, ],
|
||||
[ 0x94, 0x47, 0xbe, 0x2c, 0xf5, 0xe9, 0x9a, 0x69, ],
|
||||
[ 0x9c, 0xd3, 0x8d, 0x96, 0xf0, 0xb3, 0xc1, 0x4b, ],
|
||||
[ 0xbd, 0x61, 0x79, 0xa7, 0x1d, 0xc9, 0x6d, 0xbb, ],
|
||||
[ 0x98, 0xee, 0xa2, 0x1a, 0xf2, 0x5c, 0xd6, 0xbe, ],
|
||||
[ 0xc7, 0x67, 0x3b, 0x2e, 0xb0, 0xcb, 0xf2, 0xd0, ],
|
||||
[ 0x88, 0x3e, 0xa3, 0xe3, 0x95, 0x67, 0x53, 0x93, ],
|
||||
[ 0xc8, 0xce, 0x5c, 0xcd, 0x8c, 0x03, 0x0c, 0xa8, ],
|
||||
[ 0x94, 0xaf, 0x49, 0xf6, 0xc6, 0x50, 0xad, 0xb8, ],
|
||||
[ 0xea, 0xb8, 0x85, 0x8a, 0xde, 0x92, 0xe1, 0xbc, ],
|
||||
[ 0xf3, 0x15, 0xbb, 0x5b, 0xb8, 0x35, 0xd8, 0x17, ],
|
||||
[ 0xad, 0xcf, 0x6b, 0x07, 0x63, 0x61, 0x2e, 0x2f, ],
|
||||
[ 0xa5, 0xc9, 0x1d, 0xa7, 0xac, 0xaa, 0x4d, 0xde, ],
|
||||
[ 0x71, 0x65, 0x95, 0x87, 0x66, 0x50, 0xa2, 0xa6, ],
|
||||
[ 0x28, 0xef, 0x49, 0x5c, 0x53, 0xa3, 0x87, 0xad, ],
|
||||
[ 0x42, 0xc3, 0x41, 0xd8, 0xfa, 0x92, 0xd8, 0x32, ],
|
||||
[ 0xce, 0x7c, 0xf2, 0x72, 0x2f, 0x51, 0x27, 0x71, ],
|
||||
[ 0xe3, 0x78, 0x59, 0xf9, 0x46, 0x23, 0xf3, 0xa7, ],
|
||||
[ 0x38, 0x12, 0x05, 0xbb, 0x1a, 0xb0, 0xe0, 0x12, ],
|
||||
[ 0xae, 0x97, 0xa1, 0x0f, 0xd4, 0x34, 0xe0, 0x15, ],
|
||||
[ 0xb4, 0xa3, 0x15, 0x08, 0xbe, 0xff, 0x4d, 0x31, ],
|
||||
[ 0x81, 0x39, 0x62, 0x29, 0xf0, 0x90, 0x79, 0x02, ],
|
||||
[ 0x4d, 0x0c, 0xf4, 0x9e, 0xe5, 0xd4, 0xdc, 0xca, ],
|
||||
[ 0x5c, 0x73, 0x33, 0x6a, 0x76, 0xd8, 0xbf, 0x9a, ],
|
||||
[ 0xd0, 0xa7, 0x04, 0x53, 0x6b, 0xa9, 0x3e, 0x0e, ],
|
||||
[ 0x92, 0x59, 0x58, 0xfc, 0xd6, 0x42, 0x0c, 0xad, ],
|
||||
[ 0xa9, 0x15, 0xc2, 0x9b, 0xc8, 0x06, 0x73, 0x18, ],
|
||||
[ 0x95, 0x2b, 0x79, 0xf3, 0xbc, 0x0a, 0xa6, 0xd4, ],
|
||||
[ 0xf2, 0x1d, 0xf2, 0xe4, 0x1d, 0x45, 0x35, 0xf9, ],
|
||||
[ 0x87, 0x57, 0x75, 0x19, 0x04, 0x8f, 0x53, 0xa9, ],
|
||||
[ 0x10, 0xa5, 0x6c, 0xf5, 0xdf, 0xcd, 0x9a, 0xdb, ],
|
||||
[ 0xeb, 0x75, 0x09, 0x5c, 0xcd, 0x98, 0x6c, 0xd0, ],
|
||||
[ 0x51, 0xa9, 0xcb, 0x9e, 0xcb, 0xa3, 0x12, 0xe6, ],
|
||||
[ 0x96, 0xaf, 0xad, 0xfc, 0x2c, 0xe6, 0x66, 0xc7, ],
|
||||
[ 0x72, 0xfe, 0x52, 0x97, 0x5a, 0x43, 0x64, 0xee, ],
|
||||
[ 0x5a, 0x16, 0x45, 0xb2, 0x76, 0xd5, 0x92, 0xa1, ],
|
||||
[ 0xb2, 0x74, 0xcb, 0x8e, 0xbf, 0x87, 0x87, 0x0a, ],
|
||||
[ 0x6f, 0x9b, 0xb4, 0x20, 0x3d, 0xe7, 0xb3, 0x81, ],
|
||||
[ 0xea, 0xec, 0xb2, 0xa3, 0x0b, 0x22, 0xa8, 0x7f, ],
|
||||
[ 0x99, 0x24, 0xa4, 0x3c, 0xc1, 0x31, 0x57, 0x24, ],
|
||||
[ 0xbd, 0x83, 0x8d, 0x3a, 0xaf, 0xbf, 0x8d, 0xb7, ],
|
||||
[ 0x0b, 0x1a, 0x2a, 0x32, 0x65, 0xd5, 0x1a, 0xea, ],
|
||||
[ 0x13, 0x50, 0x79, 0xa3, 0x23, 0x1c, 0xe6, 0x60, ],
|
||||
[ 0x93, 0x2b, 0x28, 0x46, 0xe4, 0xd7, 0x06, 0x66, ],
|
||||
[ 0xe1, 0x91, 0x5f, 0x5c, 0xb1, 0xec, 0xa4, 0x6c, ],
|
||||
[ 0xf3, 0x25, 0x96, 0x5c, 0xa1, 0x6d, 0x62, 0x9f, ],
|
||||
[ 0x57, 0x5f, 0xf2, 0x8e, 0x60, 0x38, 0x1b, 0xe5, ],
|
||||
[ 0x72, 0x45, 0x06, 0xeb, 0x4c, 0x32, 0x8a, 0x95, ]
|
||||
];
|
||||
|
||||
let k0 = 0x_07_06_05_04_03_02_01_00_u64;
|
||||
let k1 = 0x_0f_0e_0d_0c_0b_0a_09_08_u64;
|
||||
|
|
@ -433,7 +433,7 @@ pub fn test_siphash() {
|
|||
let stream_inc = &State(k0,k1);
|
||||
let stream_full = &State(k0,k1);
|
||||
|
||||
fn to_hex_str(r: &[u8]/8) -> ~str {
|
||||
fn to_hex_str(r: &[u8 * 8]) -> ~str {
|
||||
let mut s = ~"";
|
||||
for vec::each(*r) |b| {
|
||||
s += uint::to_str(*b as uint, 16u);
|
||||
|
|
|
|||
|
|
@ -667,7 +667,7 @@ pub fn select2<A: Send, Ab: Send, B: Send, Bb: Send>(
|
|||
-> Either<(Option<A>, RecvPacketBuffered<B, Bb>),
|
||||
(RecvPacketBuffered<A, Ab>, Option<B>)>
|
||||
{
|
||||
let i = wait_many([a.header(), b.header()]/_);
|
||||
let i = wait_many([a.header(), b.header()]);
|
||||
|
||||
match i {
|
||||
0 => Left((try_recv(move a), move b)),
|
||||
|
|
@ -693,7 +693,7 @@ pub fn selecti<T: Selectable>(endpoints: &[T]) -> uint {
|
|||
/// Returns 0 or 1 depending on which endpoint is ready to receive
|
||||
pub fn select2i<A: Selectable, B: Selectable>(a: &A, b: &B) ->
|
||||
Either<(), ()> {
|
||||
match wait_many([a.header(), b.header()]/_) {
|
||||
match wait_many([a.header(), b.header()]) {
|
||||
0 => Left(()),
|
||||
1 => Right(()),
|
||||
_ => fail ~"wait returned unexpected index"
|
||||
|
|
|
|||
|
|
@ -187,19 +187,7 @@ pub pure fn to_str_bytes<U>(neg: bool, num: T, radix: uint,
|
|||
// Enough room to hold any number in any radix.
|
||||
// Worst case: 64-bit number, binary-radix, with
|
||||
// a leading negative sign = 65 bytes.
|
||||
let buf : [mut u8]/65 =
|
||||
[mut
|
||||
0u8,0u8,0u8,0u8,0u8, 0u8,0u8,0u8,0u8,0u8,
|
||||
0u8,0u8,0u8,0u8,0u8, 0u8,0u8,0u8,0u8,0u8,
|
||||
|
||||
0u8,0u8,0u8,0u8,0u8, 0u8,0u8,0u8,0u8,0u8,
|
||||
0u8,0u8,0u8,0u8,0u8, 0u8,0u8,0u8,0u8,0u8,
|
||||
|
||||
0u8,0u8,0u8,0u8,0u8, 0u8,0u8,0u8,0u8,0u8,
|
||||
0u8,0u8,0u8,0u8,0u8, 0u8,0u8,0u8,0u8,0u8,
|
||||
|
||||
0u8,0u8,0u8,0u8,0u8
|
||||
]/65;
|
||||
let buf : [mut u8 * 65] = [mut 0u8, ..65];
|
||||
|
||||
// FIXME (#2649): post-snapshot, you can do this without the raw
|
||||
// pointers and unsafe bits, and the codegen will prove it's all
|
||||
|
|
|
|||
|
|
@ -244,7 +244,7 @@ fn test_arena_destructors() {
|
|||
do arena.alloc { @i };
|
||||
// Allocate something with funny size and alignment, to keep
|
||||
// things interesting.
|
||||
do arena.alloc { [0u8, 1u8, 2u8]/3 };
|
||||
do arena.alloc { [0u8, 1u8, 2u8] };
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -258,7 +258,7 @@ fn test_arena_destructors_fail() {
|
|||
do arena.alloc { @i };
|
||||
// Allocate something with funny size and alignment, to keep
|
||||
// things interesting.
|
||||
do arena.alloc { [0u8, 1u8, 2u8]/3 };
|
||||
do arena.alloc { [0u8, 1u8, 2u8] };
|
||||
}
|
||||
// Now, fail while allocating
|
||||
do arena.alloc::<@int> {
|
||||
|
|
|
|||
|
|
@ -462,7 +462,7 @@ impl proto : cmp::Eq {
|
|||
#[auto_deserialize]
|
||||
enum vstore {
|
||||
// FIXME (#3469): Change uint to @expr (actually only constant exprs)
|
||||
vstore_fixed(Option<uint>), // [1,2,3,4]/_ or 4
|
||||
vstore_fixed(Option<uint>), // [1,2,3,4]
|
||||
vstore_uniq, // ~[1,2,3,4]
|
||||
vstore_box, // @[1,2,3,4]
|
||||
vstore_slice(@region) // &[1,2,3,4](foo)?
|
||||
|
|
@ -472,7 +472,8 @@ enum vstore {
|
|||
#[auto_deserialize]
|
||||
enum expr_vstore {
|
||||
// FIXME (#3469): Change uint to @expr (actually only constant exprs)
|
||||
expr_vstore_fixed(Option<uint>), // [1,2,3,4]/_ or 4
|
||||
expr_vstore_fixed(Option<uint>), // [1,2,3,4]
|
||||
>>>>>>> Remove old fixed-length vector syntax
|
||||
expr_vstore_uniq, // ~[1,2,3,4]
|
||||
expr_vstore_box, // @[1,2,3,4]
|
||||
expr_vstore_slice // &[1,2,3,4]
|
||||
|
|
|
|||
|
|
@ -207,12 +207,7 @@ fn Parser(sess: parse_sess, cfg: ast::crate_cfg,
|
|||
token: tok0.tok,
|
||||
span: span0,
|
||||
last_span: span0,
|
||||
buffer: [mut
|
||||
{tok: tok0.tok, sp: span0},
|
||||
{tok: tok0.tok, sp: span0},
|
||||
{tok: tok0.tok, sp: span0},
|
||||
{tok: tok0.tok, sp: span0}
|
||||
]/4,
|
||||
buffer: [mut {tok: tok0.tok, sp: span0}, ..4],
|
||||
buffer_start: 0,
|
||||
buffer_end: 0,
|
||||
restriction: UNRESTRICTED,
|
||||
|
|
@ -231,7 +226,7 @@ struct Parser {
|
|||
mut token: token::Token,
|
||||
mut span: span,
|
||||
mut last_span: span,
|
||||
mut buffer: [mut {tok: token::Token, sp: span}]/4,
|
||||
mut buffer: [mut {tok: token::Token, sp: span} * 4],
|
||||
mut buffer_start: int,
|
||||
mut buffer_end: int,
|
||||
mut restriction: restriction,
|
||||
|
|
|
|||
|
|
@ -233,7 +233,7 @@ fn monitor(+f: fn~(diagnostic::emitter)) {
|
|||
~"try running with RUST_LOG=rustc=0,::rt::backtrace \
|
||||
to get further details and report the results \
|
||||
to github.com/mozilla/rust/issues"
|
||||
]/_.each |note| {
|
||||
].each |note| {
|
||||
diagnostic::emit(None, *note, diagnostic::note)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ use ast::*;
|
|||
// target uses". This _includes_ integer-constants, plus the following
|
||||
// constructors:
|
||||
//
|
||||
// fixed-size vectors and strings: []/_ and ""/_
|
||||
// fixed-size vectors and strings: [] and ""/_
|
||||
// vector and string slices: &[] and &""
|
||||
// tuples: (,)
|
||||
// records: {...}
|
||||
|
|
|
|||
|
|
@ -1310,13 +1310,13 @@ fn dummy_substs(tps: ~[ty::t]) -> ty::substs {
|
|||
tps: tps}
|
||||
}
|
||||
|
||||
fn struct_field(index: uint) -> [uint]/3 {
|
||||
fn struct_field(index: uint) -> [uint * 3] {
|
||||
//! The GEPi sequence to access a field of a record/struct.
|
||||
|
||||
[0, 0, index]
|
||||
}
|
||||
|
||||
fn struct_dtor() -> [uint]/2 {
|
||||
fn struct_dtor() -> [uint * 2] {
|
||||
//! The GEPi sequence to access the dtor of a struct.
|
||||
|
||||
[0, 1]
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@ fn trans_fixed_vstore(bcx: block,
|
|||
{
|
||||
//!
|
||||
//
|
||||
// [...]/_ allocates a fixed-size array and moves it around "by value".
|
||||
// [...] allocates a fixed-size array and moves it around "by value".
|
||||
// In this case, it means that the caller has already given us a location
|
||||
// to store the array of the suitable size, so all we have to do is
|
||||
// generate the content.
|
||||
|
|
|
|||
|
|
@ -1019,7 +1019,7 @@ fn check_expr_with_unifier(fcx: @fn_ctxt,
|
|||
// functions. This is so that we have more information about the types
|
||||
// of arguments when we typecheck the functions. This isn't really the
|
||||
// right way to do this.
|
||||
for [false, true]/_.each |check_blocks| {
|
||||
for [false, true].each |check_blocks| {
|
||||
let check_blocks = *check_blocks;
|
||||
debug!("check_blocks=%b", check_blocks);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
fn wants_box(x: @[uint]) { }
|
||||
fn wants_uniq(x: ~[uint]) { }
|
||||
fn wants_three(x: [uint]/3) { }
|
||||
fn wants_three(x: [uint * 3]) { }
|
||||
|
||||
fn has_box(x: @[uint]) {
|
||||
wants_box(x);
|
||||
|
|
@ -14,13 +14,13 @@ fn has_uniq(x: ~[uint]) {
|
|||
wants_three(x); //~ ERROR [] storage differs: expected 3 but found ~
|
||||
}
|
||||
|
||||
fn has_three(x: [uint]/3) {
|
||||
fn has_three(x: [uint * 3]) {
|
||||
wants_box(x); //~ ERROR [] storage differs: expected @ but found 3
|
||||
wants_uniq(x); //~ ERROR [] storage differs: expected ~ but found 3
|
||||
wants_three(x);
|
||||
}
|
||||
|
||||
fn has_four(x: [uint]/4) {
|
||||
fn has_four(x: [uint * 4]) {
|
||||
wants_box(x); //~ ERROR [] storage differs: expected @ but found 4
|
||||
wants_uniq(x); //~ ERROR [] storage differs: expected ~ but found 4
|
||||
wants_three(x); //~ ERROR [] storage differs: expected 3 but found 4
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ fn main() {
|
|||
assert length::<int, &[int]>(x) == vec::len(x);
|
||||
|
||||
// Now try it with a type that *needs* to be borrowed
|
||||
let z = [0,1,2,3]/_;
|
||||
let z = [0,1,2,3];
|
||||
// Call a method
|
||||
for z.iterate() |y| { assert z[*y] == *y; }
|
||||
// Call a parameterized function
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fn main() {
|
||||
let x = [22]/1;
|
||||
let x = [22];
|
||||
let y = &x[0];
|
||||
assert *y == 22;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
const x : [int]/4 = [1,2,3,4];
|
||||
const x : [int * 4] = [1,2,3,4];
|
||||
const p : int = x[2];
|
||||
const y : &[int] = &[1,2,3,4];
|
||||
const q : int = y[2];
|
||||
|
|
@ -17,4 +17,4 @@ fn main() {
|
|||
assert p == 3;
|
||||
assert q == 3;
|
||||
assert t == 20;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
const x : [int]/4 = [1,2,3,4];
|
||||
const x : [int * 4] = [1,2,3,4];
|
||||
const y : &[int] = &[1,2,3,4];
|
||||
|
||||
fn main() {
|
||||
|
|
@ -7,4 +7,4 @@ fn main() {
|
|||
assert x[1] == 2;
|
||||
assert x[3] == 4;
|
||||
assert x[3] == y[3];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
fn main() {
|
||||
let x : [@int]/5 = [@1,@2,@3,@4,@5]/5;
|
||||
let _y : [@int]/5 = [@1,@2,@3,@4,@5]/_;
|
||||
let mut z = [@1,@2,@3,@4,@5]/_;
|
||||
let x : [@int * 5] = [@1,@2,@3,@4,@5];
|
||||
let _y : [@int * 5] = [@1,@2,@3,@4,@5];
|
||||
let mut z = [@1,@2,@3,@4,@5];
|
||||
z = x;
|
||||
assert *z[0] == 1;
|
||||
assert *z[4] == 5;
|
||||
|
|
|
|||
|
|
@ -4,16 +4,16 @@
|
|||
// Doesn't work; needs a design decision.
|
||||
|
||||
fn main() {
|
||||
let x : [int]/5 = [1,2,3,4,5]/5;
|
||||
let _y : [int]/5 = [1,2,3,4,5]/_;
|
||||
let mut z = [1,2,3,4,5]/_;
|
||||
let x : [int * 5] = [1,2,3,4,5];
|
||||
let _y : [int * 5] = [1,2,3,4,5];
|
||||
let mut z = [1,2,3,4,5];
|
||||
z = x;
|
||||
assert z[0] == 1;
|
||||
assert z[4] == 5;
|
||||
|
||||
let a : [int]/5 = [1,1,1,1,1]/_;
|
||||
let b : [int]/5 = [2,2,2,2,2]/_;
|
||||
let c : [int]/5 = [2,2,2,2,3]/_;
|
||||
let a : [int * 5] = [1,1,1,1,1];
|
||||
let b : [int * 5] = [2,2,2,2,2];
|
||||
let c : [int * 5] = [2,2,2,2,3];
|
||||
|
||||
log(debug, a);
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
// are implicitly copyable
|
||||
#[deny(implicit_copies)]
|
||||
fn main() {
|
||||
let arr = [1,2,3]/3;
|
||||
let arr = [1,2,3];
|
||||
let arr2 = arr;
|
||||
assert(arr[1] == 2);
|
||||
assert(arr2[2] == 3);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fn main() {
|
||||
let arr = [1,2,3]/3;
|
||||
let arr = [1,2,3];
|
||||
let struc = {a: 13u8, b: arr, c: 42};
|
||||
let s = sys::log_str(&struc);
|
||||
assert(s == ~"{ a: 13, b: [ 1, 2, 3 ], c: 42 }");
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
fn is_even(x: &uint) -> bool { (*x % 2) == 0 }
|
||||
|
||||
fn main() {
|
||||
assert ![1u, 2u]/_.all(is_even);
|
||||
assert [2u, 4u]/_.all(is_even);
|
||||
assert []/_.all(is_even);
|
||||
assert ![1u, 2u].all(is_even);
|
||||
assert [2u, 4u].all(is_even);
|
||||
assert [].all(is_even);
|
||||
|
||||
assert !Some(1u).all(is_even);
|
||||
assert Some(2u).all(is_even);
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
fn is_even(x: &uint) -> bool { (*x % 2) == 0 }
|
||||
|
||||
fn main() {
|
||||
assert ![1u, 3u]/_.any(is_even);
|
||||
assert [1u, 2u]/_.any(is_even);
|
||||
assert ![]/_.any(is_even);
|
||||
assert ![1u, 3u].any(is_even);
|
||||
assert [1u, 2u].any(is_even);
|
||||
assert ![].any(is_even);
|
||||
|
||||
assert !Some(1).any(is_even);
|
||||
assert Some(2).any(is_even);
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
fn main() {
|
||||
assert []/_.contains(&22u) == false;
|
||||
assert [1u, 3u]/_.contains(&22u) == false;
|
||||
assert [22u, 1u, 3u]/_.contains(&22u) == true;
|
||||
assert [1u, 22u, 3u]/_.contains(&22u) == true;
|
||||
assert [1u, 3u, 22u]/_.contains(&22u) == true;
|
||||
assert [].contains(&22u) == false;
|
||||
assert [1u, 3u].contains(&22u) == false;
|
||||
assert [22u, 1u, 3u].contains(&22u) == true;
|
||||
assert [1u, 22u, 3u].contains(&22u) == true;
|
||||
assert [1u, 3u, 22u].contains(&22u) == true;
|
||||
assert None.contains(&22u) == false;
|
||||
assert Some(1u).contains(&22u) == false;
|
||||
assert Some(22u).contains(&22u) == true;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
fn main() {
|
||||
assert []/_.count(&22u) == 0u;
|
||||
assert [1u, 3u]/_.count(&22u) == 0u;
|
||||
assert [22u, 1u, 3u]/_.count(&22u) == 1u;
|
||||
assert [22u, 1u, 22u]/_.count(&22u) == 2u;
|
||||
assert [].count(&22u) == 0u;
|
||||
assert [1u, 3u].count(&22u) == 0u;
|
||||
assert [22u, 1u, 3u].count(&22u) == 1u;
|
||||
assert [22u, 1u, 22u].count(&22u) == 2u;
|
||||
assert None.count(&22u) == 0u;
|
||||
assert Some(1u).count(&22u) == 0u;
|
||||
assert Some(22u).count(&22u) == 1u;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
fn main() {
|
||||
let mut c = 0u;
|
||||
for [1u, 2u, 3u, 4u, 5u]/_.eachi |i, v| {
|
||||
for [1u, 2u, 3u, 4u, 5u].eachi |i, v| {
|
||||
assert (i + 1u) == *v;
|
||||
c += 1u;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
fn is_even(+x: uint) -> bool { (x % 2) == 0 }
|
||||
|
||||
fn main() {
|
||||
assert [1, 3]/_.filter_to_vec(is_even) == ~[];
|
||||
assert [1, 2, 3]/_.filter_to_vec(is_even) == ~[2];
|
||||
assert [1, 3].filter_to_vec(is_even) == ~[];
|
||||
assert [1, 2, 3].filter_to_vec(is_even) == ~[2];
|
||||
assert None.filter_to_vec(is_even) == ~[];
|
||||
assert Some(1).filter_to_vec(is_even) == ~[];
|
||||
assert Some(2).filter_to_vec(is_even) == ~[2];
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
fn add(x: &float, y: &uint) -> float { *x + ((*y) as float) }
|
||||
|
||||
fn main() {
|
||||
assert [1u, 3u]/_.foldl(20f, add) == 24f;
|
||||
assert []/_.foldl(20f, add) == 20f;
|
||||
assert [1u, 3u].foldl(20f, add) == 24f;
|
||||
assert [].foldl(20f, add) == 20f;
|
||||
assert None.foldl(20f, add) == 20f;
|
||||
assert Some(1u).foldl(20f, add) == 21f;
|
||||
assert Some(2u).foldl(20f, add) == 22f;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
fn inc(+x: uint) -> uint { x + 1 }
|
||||
|
||||
fn main() {
|
||||
assert [1, 3]/_.map_to_vec(inc) == ~[2, 4];
|
||||
assert [1, 2, 3]/_.map_to_vec(inc) == ~[2, 3, 4];
|
||||
assert [1, 3].map_to_vec(inc) == ~[2, 4];
|
||||
assert [1, 2, 3].map_to_vec(inc) == ~[2, 3, 4];
|
||||
assert None.map_to_vec(inc) == ~[];
|
||||
assert Some(1).map_to_vec(inc) == ~[2];
|
||||
assert Some(2).map_to_vec(inc) == ~[3];
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
fn is_even(&&x: uint) -> bool { (x % 2u) == 0u }
|
||||
|
||||
fn main() {
|
||||
assert [1u, 3u]/_.min() == 1u;
|
||||
assert [3u, 1u]/_.min() == 1u;
|
||||
assert [1u, 3u].min() == 1u;
|
||||
assert [3u, 1u].min() == 1u;
|
||||
assert Some(1u).min() == 1u;
|
||||
|
||||
assert [1u, 3u]/_.max() == 3u;
|
||||
assert [3u, 1u]/_.max() == 3u;
|
||||
assert [1u, 3u].max() == 3u;
|
||||
assert [3u, 1u].max() == 3u;
|
||||
assert Some(3u).max() == 3u;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fn main() {
|
||||
assert [1u, 3u]/_.to_vec() == ~[1u, 3u];
|
||||
assert [1u, 3u].to_vec() == ~[1u, 3u];
|
||||
let e: ~[uint] = ~[];
|
||||
assert e.to_vec() == ~[];
|
||||
assert None::<uint>.to_vec() == ~[];
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ macro_rules! select (
|
|||
-> $next:ident $e:expr),+
|
||||
} )+
|
||||
} => {
|
||||
let index = pipes::selecti([$(($port).header()),+]/_);
|
||||
let index = pipes::selecti([$(($port).header()),+]);
|
||||
select_if!(index, 0, $( $port => [
|
||||
$($message$(($($x),+))dont_type_this* -> $next $e),+
|
||||
], )+)
|
||||
|
|
|
|||
|
|
@ -5,6 +5,6 @@ fn foo(x: &[int]) -> int {
|
|||
}
|
||||
|
||||
fn main() {
|
||||
let p = [1,2,3,4,5]/_;
|
||||
let p = [1,2,3,4,5];
|
||||
assert foo(p) == 1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ macro_rules! select (
|
|||
-> $next:ident $e:expr),+
|
||||
} )+
|
||||
} => {
|
||||
let index = pipes::selecti([$(($port).header()),+]/_);
|
||||
let index = pipes::selecti([$(($port).header()),+]);
|
||||
select_if!(index, 0 $(, $port => [
|
||||
$(type_this $message$(($(x $x),+))dont_type_this* -> $next => { move $e }),+
|
||||
])+)
|
||||
|
|
|
|||
Loading…
Reference in a new issue