---

yaml
---
r: 221606
b: refs/heads/master
c: abad7d6
h: refs/heads/master
v: v3

Author: pnkfelix

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 505cd8a3cc9ddc89ff766a07cc90797421296d34
+refs/heads/master: abad7d6bba9d3fa9d5f1126c8ef6f1b413db1152
 refs/heads/snap-stage3: a5c12f4e39d32af3c951b66bd2839bc0b5a1125b
 refs/heads/try: b53c0f93eedcdedd4fd89bccc5a3a09d1c5cd23e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

trunk/src/libcore/intrinsics.rs

@@ -190,7 +190,7 @@ extern "rust-intrinsic" {
     /// Drop glue is not run on the destination.
     pub fn move_val_init<T>(dst: *mut T, src: T);
 
-    // SNAP ba0e1cd
+    // SNAP d4432b3
     #[cfg(stage0)]
     /// Moves a value to an uninitialized memory location.
     ///

trunk/src/libsyntax/parse/parser.rs

@@ -2638,7 +2638,7 @@ impl<'a> Parser<'a> {
             // ... but for now: check for a place: `box(PLACE) EXPR`.
 
             if try!(self.eat(&token::OpenDelim(token::Paren)) ){
-                // SNAP ba0e1cd
+                // SNAP d4432b3
                 // Enable this warning after snapshot ...
                 //
                 // let box_span = mk_sp(lo, self.last_span.hi);
@@ -2659,9 +2659,15 @@ impl<'a> Parser<'a> {
                         self.span_err(span,
                                       &format!("expected expression, found `{}`",
                                               this_token_to_string));
+
+                        // Spanning just keyword avoids constructing
+                        // printout of arg expression (which starts
+                        // with parenthesis, as established above).
+
                         let box_span = mk_sp(lo, keyword_hi);
-                        let new_expr = format!("box () {}", pprust::expr_to_string(&place));
-                        self.span_suggestion(box_span, "try using `box ()` instead:", new_expr);
+                        self.span_suggestion(box_span,
+                                             "try using `box ()` instead:",
+                                             format!("box ()"));
                         self.abort_if_errors();
                     }
                     let subexpression = try!(self.parse_prefix_expr());