---

graydon · graydon · commit 4c3c5ff7a77a · 2012-05-02T14:47:33.000-07:00
yaml --- r: 15710 b: refs/heads/try c: b12e275 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: c2382f9ebf1ad668df7624955268f4485068449a
+refs/heads/try: b12e27595e35bd838b20011ff9fbb84e4680c46f
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
diff --git a/branches/try/src/rustc/middle/resolve.rs b/branches/try/src/rustc/middle/resolve.rs
@@ -514,8 +514,8 @@ fn resolve_names(e: @env, c: @ast::crate) {
                     e.def_map.insert(pat.id, fnd);
                 }
                 some(fnd@ast::def_const(_)) {
-                    e.sess.span_err(p.span, "Sorry, rebinding or matching \
-                      against symbolic constants is not allowed.");
+                    e.sess.span_err(p.span, "pattern variable conflicts \
+                       with constant '" + path_to_ident(p) + "'");
                 }
                 // Binds a var -- nothing needs to be done
                 _ {}
diff --git a/branches/try/src/test/compile-fail/issue-1193.rs b/branches/try/src/test/compile-fail/issue-1193.rs
@@ -1,4 +1,4 @@
-// error-pattern: Sorry, rebinding or matching against symbolic
+// error-pattern: pattern variable conflicts
 mod foo {
     type t = u8;
 

Original file line number	Diff line number	Diff line change
`@@ -514,8 +514,8 @@ fn resolve_names(e: @env, c: @ast::crate) {`
`514`	`514`	`e.def_map.insert(pat.id, fnd);`
`515`	`515`	`}`
`516`	`516`	`some(fnd@ast::def_const(_)) {`
`517`		`- e.sess.span_err(p.span, "Sorry, rebinding or matching \`
`518`		`- against symbolic constants is not allowed.");`
	`517`	`+ e.sess.span_err(p.span, "pattern variable conflicts \`
	`518`	`+ with constant '" + path_to_ident(p) + "'");`
`519`	`519`	`}`
`520`	`520`	`// Binds a var -- nothing needs to be done`
`521`	`521`	`_ {}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// error-pattern: Sorry, rebinding or matching against symbolic`
	`1`	`+// error-pattern: pattern variable conflicts`
`2`	`2`	`mod foo {`
`3`	`3`	`type t = u8;`
`4`	`4`