Error message reformatting, close #2309.

src/rustc/middle/resolve.rs

@@ -514,8 +514,8 @@ fn walk_pat(e: @env, pat: @ast::pat, sc: scopes, v: vt<scopes>) {
                     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
                 _ {}

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;