librustc: Remove all uses of the old [T * N] fixed-length vector syntax

pcwalton · pcwalton · commit 0d76fb0013a8 · 2013-03-22T19:24:02.000-07:00
diff --git a/src/libcore/cleanup.rs b/src/libcore/cleanup.rs
@@ -38,12 +38,12 @@ struct MemoryRegion { priv opaque: () }
 #[cfg(target_arch="x86")]
 #[cfg(target_arch="arm")]
 struct Registers {
-    data: [u32 * 16]
+    data: [u32, ..16]
 }
 
 #[cfg(target_arch="mips")]
 struct Registers {
-    data: [u32 * 32]
+    data: [u32, ..32]
 }
 
 #[cfg(target_arch="x86")]
@@ -52,12 +52,12 @@ struct Registers {
 struct Context {
     regs: Registers,
     next: *Context,
-    pad: [u32 * 3]
+    pad: [u32, ..3]
 }
 
 #[cfg(target_arch="x86_64")]
 struct Registers {
-    data: [u64 * 22]
+    data: [u64, ..22]
 }
 
 #[cfg(target_arch="x86_64")]
@@ -80,7 +80,7 @@ struct Task {
     // Public fields
     refcount: intptr_t,                 // 0
     id: TaskID,                         // 4
-    pad: [u32 * 2],                     // 8
+    pad: [u32, ..2],                    // 8
     ctx: Context,                       // 16
     stack_segment: *StackSegment,       // 96
     runtime_sp: uintptr_t,              // 100
diff --git a/src/libcore/hash.rs b/src/libcore/hash.rs
@@ -162,7 +162,7 @@ struct SipState {
     mut v1: u64,
     mut v2: u64,
     mut v3: u64,
-    mut tail: [u8 * 8], // unprocessed bytes
+    mut tail: [u8, ..8], // unprocessed bytes
     mut ntail: uint,  // how many bytes in tail are valid
 }
 
@@ -369,7 +369,7 @@ impl Streaming for SipState {
 
 #[test]
 pub fn test_siphash() {
-    let vecs : [[u8 * 8] * 64] = [
+    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, ],
@@ -443,7 +443,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_radix(*b as uint, 16u);
diff --git a/src/libcore/libc.rs b/src/libcore/libc.rs
@@ -342,7 +342,7 @@ pub mod types {
                     st_mtime_nsec: c_long,
                     st_ctime: time_t,
                     st_ctime_nsec: c_long,
-                    __unused: [c_long * 3],
+                    __unused: [c_long, ..3],
                 }
             }
             pub mod posix08 {
@@ -430,7 +430,7 @@ pub mod types {
                     st_lspare: int32_t,
                     st_birthtime: time_t,
                     st_birthtime_nsec: c_long,
-                    __unused: [uint8_t * 2],
+                    __unused: [uint8_t, ..2],
                 }
             }
             pub mod posix08 {
@@ -631,7 +631,7 @@ pub mod types {
                     st_flags: uint32_t,
                     st_gen: uint32_t,
                     st_lspare: int32_t,
-                    st_qspare: [int64_t * 2],
+                    st_qspare: [int64_t, ..2],
                 }
             }
             pub mod posix08 {
@@ -712,7 +712,7 @@ pub mod types {
                     st_flags: uint32_t,
                     st_gen: uint32_t,
                     st_lspare: int32_t,
-                    st_qspare: [int64_t * 2],
+                    st_qspare: [int64_t, ..2],
                 }
             }
             pub mod posix08 {
diff --git a/src/libcore/rt/context.rs b/src/libcore/rt/context.rs
@@ -102,7 +102,7 @@ fn initialize_call_frame(regs: &mut Registers,
 }
 
 #[cfg(target_arch = "x86_64")]
-type Registers = [uint * 22];
+type Registers = [uint, ..22];
 
 #[cfg(target_arch = "x86_64")]
 fn new_regs() -> ~Registers { ~[0, .. 22] }
@@ -137,7 +137,7 @@ fn initialize_call_frame(regs: &mut Registers,
 }
 
 #[cfg(target_arch = "arm")]
-type Registers = [uint * 32];
+type Registers = [uint, ..32];
 
 #[cfg(target_arch = "arm")]
 fn new_regs() -> ~Registers { ~[0, .. 32] }
@@ -156,7 +156,7 @@ fn initialize_call_frame(regs: &mut Registers,
 }
 
 #[cfg(target_arch = "mips")]
-type Registers = [uint * 32];
+type Registers = [uint, ..32];
 
 #[cfg(target_arch = "mips")]
 fn new_regs() -> ~Registers { ~[0, .. 32] }
diff --git a/src/libcore/str.rs b/src/libcore/str.rs
@@ -1921,12 +1921,12 @@ static max_five_b: uint = 67108864u;
 static tag_six_b: uint = 252u;
 
 // Constants used for converting strs to floats
-pub static inf_buf: [u8*3] = ['i' as u8, 'n' as u8, 'f' as u8];
-pub static positive_inf_buf: [u8*4] = ['+' as u8, 'i' as u8,
-                                       'n' as u8, 'f' as u8];
-pub static negative_inf_buf: [u8*4] = ['-' as u8, 'i' as u8,
-                                       'n' as u8, 'f' as u8];
-pub static nan_buf: [u8*3] = ['N' as u8, 'a' as u8, 'N' as u8];
+pub static inf_buf: [u8, ..3] = ['i' as u8, 'n' as u8, 'f' as u8];
+pub static positive_inf_buf: [u8, ..4] = ['+' as u8, 'i' as u8,
+                                          'n' as u8, 'f' as u8];
+pub static negative_inf_buf: [u8, ..4] = ['-' as u8, 'i' as u8,
+                                          'n' as u8, 'f' as u8];
+pub static nan_buf: [u8, ..3] = ['N' as u8, 'a' as u8, 'N' as u8];
 
 /**
  * Work with the byte buffer of a string.
diff --git a/src/libcore/sys.rs b/src/libcore/sys.rs
@@ -194,7 +194,7 @@ pub mod tests {
 
     #[test]
     pub fn nonzero_size_of_basic() {
-        type Z = [i8 * 0];
+        type Z = [i8, ..0];
         fail_unless!(size_of::<Z>() == 0u);
         fail_unless!(nonzero_size_of::<Z>() == 1u);
         fail_unless!(nonzero_size_of::<uint>() == size_of::<uint>());
diff --git a/src/libcore/trie.rs b/src/libcore/trie.rs
@@ -215,7 +215,9 @@ impl TrieSet {
 
 struct TrieNode<T> {
     count: uint,
-    children: [Child<T> * 16] // FIXME: #3469: can't use the SIZE constant yet
+
+    // FIXME: #3469: can't use the SIZE constant yet
+    children: [Child<T>, ..16]
 }
 
 impl<T> TrieNode<T> {
diff --git a/src/libcore/vec.rs b/src/libcore/vec.rs
@@ -2642,7 +2642,7 @@ mod tests {
 
     #[test]
     fn test_len_divzero() {
-        type Z = [i8 * 0];
+        type Z = [i8, ..0];
         let v0 : &[Z] = &[];
         let v1 : &[Z] = &[[]];
         let v2 : &[Z] = &[[], []];
diff --git a/src/librustc/middle/typeck/infer/region_inference.rs b/src/librustc/middle/typeck/infer/region_inference.rs
@@ -1187,11 +1187,11 @@ struct GraphNode {
     span: span,
     classification: Classification,
     value: GraphNodeValue,
-    head_edge: [uint * 2],
+    head_edge: [uint, ..2],
 }
 
 struct GraphEdge {
-    next_edge: [uint * 2],
+    next_edge: [uint, ..2],
     constraint: Constraint,
     span: span,
 }
diff --git a/src/libstd/flatpipes.rs b/src/libstd/flatpipes.rs
@@ -254,7 +254,7 @@ pub trait ByteChan {
     fn send(&self, val: ~[u8]);
 }
 
-static CONTINUE: [u8 * 4] = [0xAA, 0xBB, 0xCC, 0xDD];
+static CONTINUE: [u8, ..4] = [0xAA, 0xBB, 0xCC, 0xDD];
 
 impl<T,U:Unflattener<T>,P:BytePort> GenericPort<T> for FlatPort<T, U, P> {
     fn recv(&self) -> T {
@@ -921,7 +921,7 @@ mod test {
         }
 
         fn test_try_recv_none3<P:BytePort>(loader: PortLoader<P>) {
-            static CONTINUE: [u8 * 4] = [0xAA, 0xBB, 0xCC, 0xDD];
+            static CONTINUE: [u8, ..4] = [0xAA, 0xBB, 0xCC, 0xDD];
             // The control word is followed by garbage
             let bytes = CONTINUE.to_vec() + ~[0];
             let port = loader(bytes);
@@ -940,7 +940,7 @@ mod test {
 
         fn test_try_recv_none4<P:BytePort>(+loader: PortLoader<P>) {
             fail_unless!(do task::try || {
-                static CONTINUE: [u8 * 4] = [0xAA, 0xBB, 0xCC, 0xDD];
+                static CONTINUE: [u8, ..4] = [0xAA, 0xBB, 0xCC, 0xDD];
                 // The control word is followed by a valid length,
                 // then undeserializable garbage
                 let len_bytes = do io::u64_to_be_bytes(
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
@@ -251,7 +251,7 @@ pub struct Parser {
     token: @mut token::Token,
     span: @mut span,
     last_span: @mut span,
-    buffer: @mut [TokenAndSpan * 4],
+    buffer: @mut [TokenAndSpan, ..4],
     buffer_start: @mut int,
     buffer_end: @mut int,
     tokens_consumed: @mut uint,
diff --git a/src/test/bench/noise.rs b/src/test/bench/noise.rs
@@ -24,8 +24,8 @@ fn gradient(orig: Vec2, grad: Vec2, p: Vec2) -> f32 {
 }
 
 struct Noise2DContext {
-    rgradients: [Vec2 * 256],
-    permutations: [int * 256],
+    rgradients: [Vec2, ..256],
+    permutations: [int, ..256],
 }
 
 fn Noise2DContext() -> ~Noise2DContext {
@@ -50,7 +50,7 @@ pub impl Noise2DContext {
     }
 
     #[inline(always)]
-    fn get_gradients(&self, gradients: &mut [Vec2 * 4], origins: &mut [Vec2 * 4], x: f32, y: f32) {
+    fn get_gradients(&self, gradients: &mut [Vec2, ..4], origins: &mut [Vec2, ..4], x: f32, y: f32) {
         let x0f = f32::floor(x);
         let y0f = f32::floor(y);
         let x0 = x0f as int;
diff --git a/src/test/bench/sudoku.rs b/src/test/bench/sudoku.rs
@@ -44,7 +44,7 @@ pub impl Sudoku {
         return Sudoku { grid: g }
     }
 
-    pub fn from_vec(vec: &[[u8 * 9] * 9]) -> Sudoku {
+    pub fn from_vec(vec: &[[u8, ..9], ..9]) -> Sudoku {
         let mut g = do vec::from_fn(9u) |i| {
             do vec::from_fn(9u) |j| { vec[i][j] }
         };
@@ -182,7 +182,7 @@ impl Colors {
     }
 }
 
-static default_sudoku: [[u8 * 9] * 9] = [
+static default_sudoku: [[u8, ..9], ..9] = [
          /* 0    1    2    3    4    5    6    7    8    */
   /* 0 */  [0u8, 4u8, 0u8, 6u8, 0u8, 0u8, 0u8, 3u8, 2u8],
   /* 1 */  [0u8, 0u8, 8u8, 0u8, 2u8, 0u8, 0u8, 0u8, 0u8],
@@ -196,7 +196,7 @@ static default_sudoku: [[u8 * 9] * 9] = [
 ];
 
 #[cfg(test)]
-static default_solution: [[u8 * 9] * 9] = [
+static default_solution: [[u8, ..9], ..9] = [
          /* 0    1    2    3    4    5    6    7    8    */
   /* 0 */  [1u8, 4u8, 9u8, 6u8, 7u8, 5u8, 8u8, 3u8, 2u8],
   /* 1 */  [5u8, 3u8, 8u8, 1u8, 2u8, 9u8, 7u8, 4u8, 6u8],
diff --git a/src/test/compile-fail/const-cast-wrong-type.rs b/src/test/compile-fail/const-cast-wrong-type.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-static a: [u8 * 3] = ['h' as u8, 'i' as u8, 0 as u8];
+static a: [u8, ..3] = ['h' as u8, 'i' as u8, 0 as u8];
 static b: *i8 = &a as *i8; //~ ERROR mismatched types
 
 fn main() {
diff --git a/src/test/compile-fail/evec-subtyping.rs b/src/test/compile-fail/evec-subtyping.rs
@@ -10,7 +10,7 @@
 
 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);
@@ -24,13 +24,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
diff --git a/src/test/compile-fail/issue-4517.rs b/src/test/compile-fail/issue-4517.rs
@@ -1,6 +1,6 @@
 fn bar(int_param: int) {}
 
 fn main() {
-     let foo: [u8 * 4] = [1u8, ..4u8];
+     let foo: [u8, ..4] = [1u8, ..4u8];
      bar(foo); //~ ERROR mismatched types: expected `int` but found `[u8 * 4]` (expected int but found vector)
 }
diff --git a/src/test/run-pass/const-autoderef.rs b/src/test/run-pass/const-autoderef.rs
@@ -8,9 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-static A: [u8 * 1] = ['h' as u8];
+static A: [u8, ..1] = ['h' as u8];
 static B: u8 = (&A)[0];
-static C: &'static &'static &'static &'static [u8 * 1] = & & & &A;
+static C: &'static &'static &'static &'static [u8, ..1] = & & & &A;
 static D: u8 = (&C)[0];
 
 pub fn main() {
diff --git a/src/test/run-pass/const-enum-vector.rs b/src/test/run-pass/const-enum-vector.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 enum E { V1(int), V0 }
-static C: [E * 3] = [V0, V1(0xDEADBEE), V0];
+static C: [E, ..3] = [V0, V1(0xDEADBEE), V0];
 
 pub fn main() {
     match C[1] {
diff --git a/src/test/run-pass/const-expr-in-fixed-length-vec.rs b/src/test/run-pass/const-expr-in-fixed-length-vec.rs
@@ -14,6 +14,6 @@
 fn main() {
 
     static FOO: int = 2;
-    let _v: [int * FOO*3];
+    let _v: [int, ..FOO*3];
 
 }
diff --git a/src/test/run-pass/const-fields-and-indexing.rs b/src/test/run-pass/const-fields-and-indexing.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-static x : [int * 4] = [1,2,3,4];
+static x : [int, ..4] = [1,2,3,4];
 static p : int = x[2];
 static y : &'static [int] = &[1,2,3,4];
 static q : int = y[2];
diff --git a/src/test/run-pass/const-region-ptrs-noncopy.rs b/src/test/run-pass/const-region-ptrs-noncopy.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-type Big = [u64 * 8];
+type Big = [u64, ..8];
 struct Pair { a: int, b: &'self Big }
 static x: &'static Big = &([13, 14, 10, 13, 11, 14, 14, 15]);
 static y: &'static Pair<'static> = &Pair {a: 15, b: x};
diff --git a/src/test/run-pass/const-str-ptr.rs b/src/test/run-pass/const-str-ptr.rs
@@ -8,8 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-static a: [u8 * 3] = ['h' as u8, 'i' as u8, 0 as u8];
-static c: &'static [u8 * 3] = &a;
+static a: [u8, ..3] = ['h' as u8, 'i' as u8, 0 as u8];
+static c: &'static [u8, ..3] = &a;
 static b: *u8 = c as *u8;
 
 fn main() {
diff --git a/src/test/run-pass/const-vecs-and-slices.rs b/src/test/run-pass/const-vecs-and-slices.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-static x : [int * 4] = [1,2,3,4];
+static x : [int, ..4] = [1,2,3,4];
 static y : &'static [int] = &[1,2,3,4];
 
 pub fn main() {
diff --git a/src/test/run-pass/evec-internal-boxes.rs b/src/test/run-pass/evec-internal-boxes.rs
@@ -9,8 +9,8 @@
 // except according to those terms.
 
 pub fn main() {
-    let x : [@int * 5] = [@1,@2,@3,@4,@5];
-    let _y : [@int * 5] = [@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;
     fail_unless!(*z[0] == 1);
diff --git a/src/test/run-pass/evec-internal.rs b/src/test/run-pass/evec-internal.rs
diff --git a/src/test/run-pass/fixed_length_vec_glue.rs b/src/test/run-pass/fixed_length_vec_glue.rs
diff --git a/src/test/run-pass/issue-3656.rs b/src/test/run-pass/issue-3656.rs
diff --git a/src/test/run-pass/region-dependent-addr-of.rs b/src/test/run-pass/region-dependent-addr-of.rs
diff --git a/src/test/run-pass/vec-fixed-length.rs b/src/test/run-pass/vec-fixed-length.rs

Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,7 @@ pub mod types {`
`342`	`342`	`st_mtime_nsec: c_long,`
`343`	`343`	`st_ctime: time_t,`
`344`	`344`	`st_ctime_nsec: c_long,`
`345`		`- __unused: [c_long * 3],`
	`345`	`+ __unused: [c_long, ..3],`
`346`	`346`	`}`
`347`	`347`	`}`
`348`	`348`	`pub mod posix08 {`
`@@ -430,7 +430,7 @@ pub mod types {`
`430`	`430`	`st_lspare: int32_t,`
`431`	`431`	`st_birthtime: time_t,`
`432`	`432`	`st_birthtime_nsec: c_long,`
`433`		`- __unused: [uint8_t * 2],`
	`433`	`+ __unused: [uint8_t, ..2],`
`434`	`434`	`}`
`435`	`435`	`}`
`436`	`436`	`pub mod posix08 {`
`@@ -631,7 +631,7 @@ pub mod types {`
`631`	`631`	`st_flags: uint32_t,`
`632`	`632`	`st_gen: uint32_t,`
`633`	`633`	`st_lspare: int32_t,`
`634`		`- st_qspare: [int64_t * 2],`
	`634`	`+ st_qspare: [int64_t, ..2],`
`635`	`635`	`}`
`636`	`636`	`}`
`637`	`637`	`pub mod posix08 {`
`@@ -712,7 +712,7 @@ pub mod types {`
`712`	`712`	`st_flags: uint32_t,`
`713`	`713`	`st_gen: uint32_t,`
`714`	`714`	`st_lspare: int32_t,`
`715`		`- st_qspare: [int64_t * 2],`
	`715`	`+ st_qspare: [int64_t, ..2],`
`716`	`716`	`}`
`717`	`717`	`}`
`718`	`718`	`pub mod posix08 {`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ fn initialize_call_frame(regs: &mut Registers,`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`#[cfg(target_arch = "x86_64")]`
`105`		`-type Registers = [uint * 22];`
	`105`	`+type Registers = [uint, ..22];`
`106`	`106`
`107`	`107`	`#[cfg(target_arch = "x86_64")]`
`108`	`108`	`fn new_regs() -> ~Registers { ~[0, .. 22] }`
`@@ -137,7 +137,7 @@ fn initialize_call_frame(regs: &mut Registers,`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`#[cfg(target_arch = "arm")]`
`140`		`-type Registers = [uint * 32];`
	`140`	`+type Registers = [uint, ..32];`
`141`	`141`
`142`	`142`	`#[cfg(target_arch = "arm")]`
`143`	`143`	`fn new_regs() -> ~Registers { ~[0, .. 32] }`
`@@ -156,7 +156,7 @@ fn initialize_call_frame(regs: &mut Registers,`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`#[cfg(target_arch = "mips")]`
`159`		`-type Registers = [uint * 32];`
	`159`	`+type Registers = [uint, ..32];`
`160`	`160`
`161`	`161`	`#[cfg(target_arch = "mips")]`
`162`	`162`	`fn new_regs() -> ~Registers { ~[0, .. 32] }`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,9 @@ impl TrieSet {`
`215`	`215`
`216`	`216`	`struct TrieNode<T> {`
`217`	`217`	`count: uint,`
`218`		`- children: [Child<T> * 16] // FIXME: #3469: can't use the SIZE constant yet`
	`218`	`+`
	`219`	`+ // FIXME: #3469: can't use the SIZE constant yet`
	`220`	`+ children: [Child<T>, ..16]`
`219`	`221`	`}`
`220`	`222`
`221`	`223`	`impl<T> TrieNode<T> {`
Original file line number	Diff line number	Diff line change
`@@ -1187,11 +1187,11 @@ struct GraphNode {`
`1187`	`1187`	`span: span,`
`1188`	`1188`	`classification: Classification,`
`1189`	`1189`	`value: GraphNodeValue,`
`1190`		`- head_edge: [uint * 2],`
	`1190`	`+ head_edge: [uint, ..2],`
`1191`	`1191`	`}`
`1192`	`1192`
`1193`	`1193`	`struct GraphEdge {`
`1194`		`- next_edge: [uint * 2],`
	`1194`	`+ next_edge: [uint, ..2],`
`1195`	`1195`	`constraint: Constraint,`
`1196`	`1196`	`span: span,`
`1197`	`1197`	`}`