Test fixes from the rollup

diff --git a/src/doc/reference.md b/src/doc/reference.md
index 9cc70118b145f201bd3b8a7c029adea6f7682589..9a02a3b815e8ace6cc42b8f0b96498da1381854b 100644 (file)
--- a/src/doc/reference.md
+++ b/src/doc/reference.md
@@ -1412,7 +1412,7 @@ struct BitsNStrings<'a> {
     mystring: &'a str
 }
 
-static bits_n_strings: BitsNStrings<'static> = BitsNStrings {
+static BITS_N_STRINGS: BitsNStrings<'static> = BitsNStrings {
     mybits: BITS,
     mystring: STRING
 };

diff --git a/src/test/pretty/issue-4264.pp b/src/test/pretty/issue-4264.pp
index 376a3a38fda1ed3d566a8dc2550ff1b6008f37e5..2bc09d7e96e58bc9dca3ef0dca9a6bedb66d9dd1 100644 (file)
--- a/src/test/pretty/issue-4264.pp
+++ b/src/test/pretty/issue-4264.pp
@@ -26,33 +26,33 @@ 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 _: [(), ..(FOO as uint)] = ([(() as ())] as [(), ..1]);
 
-    let _: [(), ..(1u 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]);
+        (((&((([(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: [&'static str, ..(1u as uint)] =
-                 ([("test" as &'static str)] as [&'static str, .. 1]);
+                 ([("test" as &'static str)] as [&'static str, ..1]);
              let __args_vec =
-                 (&([] as [core::fmt::Argument<'_>, .. 0]) as
-                     &[core::fmt::Argument<'_>, .. 0]);
+                 (&([] as [core::fmt::Argument<'_>, ..0]) as
+                     &[core::fmt::Argument<'_>, ..0]);
              let __args =
                  (unsafe {
                       ((::std::fmt::Arguments::new as
                            unsafe fn(&'static [&'static str], &'a [core::fmt::Argument<'a>]) -> core::fmt::Arguments<'a>)((__STATIC_FMTSTR
                                                                                                                               as
-                                                                                                                              [&'static str, .. 1]),
+                                                                                                                              [&'static str, ..1]),
                                                                                                                           (__args_vec
                                                                                                                               as
-                                                                                                                              &[core::fmt::Argument<'_>, .. 0]))
+                                                                                                                              &[core::fmt::Argument<'_>, ..0]))
                           as core::fmt::Arguments<'_>)
                   } as core::fmt::Arguments<'_>);
 
@@ -83,8 +83,8 @@ 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([int, ..3]) -> [int, ..3])(([(1 as int), (2 as int),
+                                             (3 as int)] as [int, ..3])) as
+            [int, ..3]);
 }
 fn main() { }