---

pcwalton · pcwalton · commit 101de8c83a3a · 2014-01-02T14:16:07.000-08:00
yaml --- r: 89245 b: refs/heads/snap-stage3 c: 0c6cee5 h: refs/heads/master i: 89243: c7be3fe v: v3
diff --git a/[refs] b/[refs]
@@ -1,7 +1,7 @@
 ---
 refs/heads/master: deeca5d586bfaa4aa60246f671a8d611d38f6248
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 758d854436a2174c85717a64b8a90ed4041962d8
+refs/heads/snap-stage3: 0c6cee55eaf3871c4bb659fea9b3ada9ad1f9b2b
 refs/heads/try: b160761e35efcd1207112b3b782c06633cf441a8
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
diff --git a/branches/snap-stage3/src/libsyntax/ext/format.rs b/branches/snap-stage3/src/libsyntax/ext/format.rs
@@ -86,13 +86,13 @@ impl<'a> Context<'a> {
                         i
                     }
                     _ if named => {
-                        self.ecx.span_err(*p.span,
+                        self.ecx.span_err(p.span,
                                           "expected ident, positional arguments \
                                            cannot follow named arguments");
                         return (extra, None);
                     }
                     _ => {
-                        self.ecx.span_err(*p.span,
+                        self.ecx.span_err(p.span,
                                           format!("expected ident for named \
                                                 argument, but found `{}`",
                                                p.this_token_to_str()));
diff --git a/branches/snap-stage3/src/libsyntax/ext/tt/macro_rules.rs b/branches/snap-stage3/src/libsyntax/ext/tt/macro_rules.rs
@@ -48,7 +48,7 @@ impl ParserAnyMacro {
             let msg = format!("macro expansion ignores token `{}` and any \
                                following",
                               token_str);
-            let span = *parser.get().span;
+            let span = parser.get().span;
             parser.get().span_err(span, msg);
         }
     }
diff --git a/branches/snap-stage3/src/libsyntax/parse/parser.rs b/branches/snap-stage3/src/libsyntax/parse/parser.rs

Original file line number	Diff line number	Diff line change
`@@ -86,13 +86,13 @@ impl<'a> Context<'a> {`
`86`	`86`	`i`
`87`	`87`	`}`
`88`	`88`	`_ if named => {`
`89`		`- self.ecx.span_err(*p.span,`
	`89`	`+ self.ecx.span_err(p.span,`
`90`	`90`	`"expected ident, positional arguments \`
`91`	`91`	`cannot follow named arguments");`
`92`	`92`	`return (extra, None);`
`93`	`93`	`}`
`94`	`94`	`_ => {`
`95`		`- self.ecx.span_err(*p.span,`
	`95`	`+ self.ecx.span_err(p.span,`
`96`	`96`	`format!("expected ident for named \`
`97`	`97`	argument, but found `{}`",
`98`	`98`	`p.this_token_to_str()));`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ impl ParserAnyMacro {`
`48`	`48`	let msg = format!("macro expansion ignores token `{}` and any \
`49`	`49`	`following",`
`50`	`50`	`token_str);`
`51`		`- let span = *parser.get().span;`
	`51`	`+ let span = parser.get().span;`
`52`	`52`	`parser.get().span_err(span, msg);`
`53`	`53`	`}`
`54`	`54`	`}`