---

yaml
---
r: 95103
b: refs/heads/dist-snap
c: eafbcfb
h: refs/heads/master
i:
  95101: e7276ff
  95099: a647fea
  95095: 639d826
  95087: cf51d41
  95071: d87cad2
  95039: efa6863
  94975: 1fc2bcc
v: v3

Author: alexcrichton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 24a253778aa26222cae97e3b57f85e5054a39977
+refs/heads/dist-snap: eafbcfb73cad912a0b2c2ec24f028257e5f2f999
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/doc/tutorial-rustpkg.md

@@ -35,11 +35,11 @@ This makes sense, as we haven't gotten it from anywhere yet!  Luckily for us,
 used like this:
 
 ~~~ {.notrust}
-$ rustpkg install PKG_ID
+$ rustpkg install pkg_id
 ~~~
 
-This will install a package named `PKG_ID` into your current Rust environment.
-I called it `PKG_ID` in this example because `rustpkg` calls this a 'package
+This will install a package named 'pkg_id' into your current Rust environment.
+I called it 'pkg_id' in this example because `rustpkg` calls this a 'package
 identifier.' When using it with an external package like this, it's often a
 URI fragment.  You see, Rust has no central authority for packages. You can
 build your own `hello` library if you want, and that's fine. We'd both host

branches/dist-snap/src/libsyntax/ext/expand.rs

@@ -821,7 +821,7 @@ pub fn std_macros() -> @str {
                 if lvl <= __log_level() {
                     format_args!(|args| {
                         ::std::logging::log(lvl, args)
-                    }, \"{}\", fmt!(\"%?\", $arg))
+                    }, \"{}\", fmt!(\"{:?}\", $arg))
                 }
             });
             ($lvl:expr, $($arg:expr),+) => ({

branches/dist-snap/src/libsyntax/ext/format.rs

@@ -319,6 +319,17 @@ impl Context {
         }
     }
 
+    /// These attributes are applied to all statics that this syntax extension
+    /// will generate.
+    fn static_attrs(&self) -> ~[ast::Attribute] {
+        // Flag statics as `address_insignificant` so LLVM can merge duplicate
+        // globals as much as possible (which we're generating a whole lot of).
+        let unnamed = self.ecx.meta_word(self.fmtsp, @"address_insignificant");
+        let unnamed = self.ecx.attribute(self.fmtsp, unnamed);
+
+        return ~[unnamed];
+    }
+
     /// Translate a `parse::Piece` to a static `rt::Piece`
     fn trans_piece(&mut self, piece: &parse::Piece) -> @ast::Expr {
         let sp = self.fmtsp;
@@ -444,14 +455,9 @@ impl Context {
                 ~[]
             ), None);
             let st = ast::item_static(ty, ast::MutImmutable, method);
-            let static_name = self.ecx.ident_of(format!("__static_method_{}",
+            let static_name = self.ecx.ident_of(format!("__STATIC_METHOD_{}",
                                                      self.method_statics.len()));
-            // Flag these statics as `address_insignificant` so LLVM can
-            // merge duplicate globals as much as possible (which we're
-            // generating a whole lot of).
-            let unnamed = self.ecx.meta_word(self.fmtsp, @"address_insignificant");
-            let unnamed = self.ecx.attribute(self.fmtsp, unnamed);
-            let item = self.ecx.item(sp, static_name, ~[unnamed], st);
+            let item = self.ecx.item(sp, static_name, self.static_attrs(), st);
             self.method_statics.push(item);
             self.ecx.expr_ident(sp, static_name)
         };
@@ -572,11 +578,9 @@ impl Context {
         );
         let ty = self.ecx.ty(self.fmtsp, ty);
         let st = ast::item_static(ty, ast::MutImmutable, fmt);
-        let static_name = self.ecx.ident_of("__static_fmtstr");
-        // see above comment for `address_insignificant` and why we do it
-        let unnamed = self.ecx.meta_word(self.fmtsp, @"address_insignificant");
-        let unnamed = self.ecx.attribute(self.fmtsp, unnamed);
-        let item = self.ecx.item(self.fmtsp, static_name, ~[unnamed], st);
+        let static_name = self.ecx.ident_of("__STATIC_FMTSTR");
+        let item = self.ecx.item(self.fmtsp, static_name,
+                                 self.static_attrs(), st);
         let decl = respan(self.fmtsp, ast::DeclItem(item));
         lets.push(@respan(self.fmtsp, ast::StmtDecl(@decl, ast::DUMMY_NODE_ID)));
 

branches/dist-snap/src/test/run-pass/format-no-uppercase-statics.rs

@@ -0,0 +1,15 @@
+// Copyright 2013 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.
+
+#[deny(non_uppercase_statics)];
+
+pub fn main() {
+    println!("I generate statics with {0, select, other{#}}", "weird names");
+}