auto merge of #16092 : alexcrichton/rust/rollup, r=alexcrichton

3 files changed, 162 insertions, 0 deletions

diff --git a/src/test/pretty/issue-4264.pp b/src/test/pretty/issue-4264.pp
new file mode 100644
index 00000000000..a9f57a48f44
--- /dev/null
+++ b/src/test/pretty/issue-4264.pp
@@ -0,0 +1,95 @@
+#![feature(phase)]
+#![no_std]
+#![feature(globs)]
+#[phase(plugin, link)]
+extern crate std = "std";
+extern crate rt = "native";
+use std::prelude::*;
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// pretty-compare-only
+// pretty-mode:typed
+// pp-exact:issue-4264.pp
+
+// #4264 fixed-length vector types
+
+pub fn foo(_: [int, ..(3 as uint)]) { }
+
+pub fn bar() {
+    static FOO: uint = ((5u as uint) - (4u as uint) as uint);
+    let _: [(), ..(FOO as uint)] = ([(() as ())] as [(), .. 1]);
+
+    let _: [(), ..(1u as uint)] = ([(() as ())] as [(), .. 1]);
+
+    let _ =
+        (((&((([(1i as int), (2 as int), (3 as int)] as [int, .. 3])) as
+                [int, .. 3]) as &[int, .. 3]) as *const _ as
+             *const [int, .. 3]) as *const [int, ..(3u as uint)] as
+            *const [int, .. 3]);
+    (match (() as ()) {
+         () => {
+             #[inline]
+             #[allow(dead_code)]
+             static __STATIC_FMTSTR:
+                    [::std::fmt::rt::Piece<'static>, ..(1u as uint)] =
+                 ([((::std::fmt::rt::String as
+                        fn(&'static str) -> core::fmt::rt::Piece<'static>)(("test"
+                                                                               as
+                                                                               &'static str))
+                       as core::fmt::rt::Piece<'static>)] as
+                     [core::fmt::rt::Piece<'static>, .. 1]);
+             let __args_vec =
+                 (&([] as &'static [core::fmt::Argument<'static>]) as
+                     &'static [core::fmt::Argument<'static>]);
+             let __args =
+                 (unsafe {
+                      ((::std::fmt::Arguments::new as
+                           unsafe fn(&'static [core::fmt::rt::Piece<'static>], &'a [core::fmt::Argument<'a>]) -> core::fmt::Arguments<'a>)((__STATIC_FMTSTR
+                                                                                                                                               as
+                                                                                                                                               [core::fmt::rt::Piece<'static>, .. 1]),
+                                                                                                                                           (__args_vec
+                                                                                                                                               as
+                                                                                                                                               &'static [core::fmt::Argument<'static>]))
+                          as core::fmt::Arguments<'static>)
+                  } as core::fmt::Arguments<'static>);
+
+
+
+
+
+
+
+
+             ((::std::fmt::format as
+                  fn(&core::fmt::Arguments<'_>) -> collections::string::String)((&(__args
+                                                                                      as
+                                                                                      core::fmt::Arguments<'static>)
+                                                                                    as
+                                                                                    &core::fmt::Arguments<'static>))
+                 as collections::string::String)
+         }
+     } as collections::string::String);
+}
+pub type Foo = [int, ..(3u as uint)];
+pub struct Bar {
+    pub x: [int, ..(3u as uint)],
+}
+pub struct TupleBar([int, ..(4u as uint)]);
+pub enum Baz { BazVariant([int, ..(5u as uint)]), }
+pub fn id<T>(x: T) -> T { (x as T) }
+pub fn use_id() {
+    let _ =
+        ((id::<[int, ..(3u as uint)]> as
+             fn([int, .. 3]) -> [int, .. 3])(([(1 as int), (2 as int),
+                                               (3 as int)] as [int, .. 3])) as
+            [int, .. 3]);
+}
+fn main() { }
diff --git a/src/test/pretty/issue-4264.rs b/src/test/pretty/issue-4264.rs
new file mode 100644
index 00000000000..ad407f48a7a
--- /dev/null
+++ b/src/test/pretty/issue-4264.rs
@@ -0,0 +1,49 @@
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// pretty-compare-only
+// pretty-mode:typed
+// pp-exact:issue-4264.pp
+
+// #4264 fixed-length vector types
+
+pub fn foo(_: [int, ..3]) {}
+
+pub fn bar() {
+    static FOO: uint = 5u - 4u;
+    let _: [(), ..FOO] = [()];
+
+    let _ : [(), ..1u] = [()];
+
+    let _ = &([1i,2,3]) as *const _ as *const [int, ..3u];
+
+    format!("test");
+}
+
+pub type Foo = [int, ..3u];
+
+pub struct Bar {
+    pub x: [int, ..3u]
+}
+
+pub struct TupleBar([int, ..4u]);
+
+pub enum Baz {
+    BazVariant([int, ..5u])
+}
+
+pub fn id<T>(x: T) -> T { x }
+
+pub fn use_id() {
+    let _ = id::<[int, ..3u]>([1,2,3]);
+}
+
+
+fn main() {}
diff --git a/src/test/run-pass/macro-invocation-in-count-expr-fixed-array-type.rs b/src/test/run-pass/macro-invocation-in-count-expr-fixed-array-type.rs
new file mode 100644
index 00000000000..847024d42ba
--- /dev/null
+++ b/src/test/run-pass/macro-invocation-in-count-expr-fixed-array-type.rs
@@ -0,0 +1,18 @@
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#![feature(macro_rules)]
+
+macro_rules! four (
+    () => (4)
+)
+fn main() {
+    let _x: [u16, ..four!()];
+}