---

yaml
---
r: 136977
b: refs/heads/dist-snap
c: 39f4bf7
h: refs/heads/master
i:
  136975: f70296f
v: v3

Author: alexcrichton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 189b7332968972f34cdbbbd9b62d97ababf53059
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 48cdb55d797a2fd8b45fd22fed7a5bec8086f19e
+refs/heads/dist-snap: 39f4bf7b1c9991cfd02f68d45ca59d6c525c4184
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/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
 };

branches/dist-snap/src/test/pretty/issue-4264.pp

@@ -26,33 +26,33 @@
 
 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 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() { }