---

yaml
---
r: 83623
b: refs/heads/try
c: 62855e2
h: refs/heads/master
i:
  83621: 0b3927b
  83619: 83b233d
  83615: 946f4df
v: v3

Author: alexcrichton

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0e4d1fc8cae42e15e00f71d9f439b01bb25a86ae
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
-refs/heads/try: eafbcfb73cad912a0b2c2ec24f028257e5f2f999
+refs/heads/try: 62855e2c089d73a2f08c96fd3b369ce2dcb08cb5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/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/try/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/try/src/libsyntax/ext/format.rs

@@ -319,17 +319,6 @@ 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;
@@ -455,9 +444,14 @@ 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()));
-            let item = self.ecx.item(sp, static_name, self.static_attrs(), st);
+            // 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);
             self.method_statics.push(item);
             self.ecx.expr_ident(sp, static_name)
         };
@@ -578,9 +572,11 @@ 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");
-        let item = self.ecx.item(self.fmtsp, static_name,
-                                 self.static_attrs(), st);
+        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 decl = respan(self.fmtsp, ast::DeclItem(item));
         lets.push(@respan(self.fmtsp, ast::StmtDecl(@decl, ast::DUMMY_NODE_ID)));