From b12e27595e35bd838b20011ff9fbb84e4680c46f Mon Sep 17 00:00:00 2001 From: Graydon Hoare Date: Wed, 2 May 2012 14:45:16 -0700 Subject: [PATCH] Error message reformatting, close #2309. --- src/rustc/middle/resolve.rs | 4 ++-- src/test/compile-fail/issue-1193.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rustc/middle/resolve.rs b/src/rustc/middle/resolve.rs index cd0696c4104b..536ff9acb8af 100644 --- a/src/rustc/middle/resolve.rs +++ b/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/src/test/compile-fail/issue-1193.rs b/src/test/compile-fail/issue-1193.rs index 9b3de9d46211..b20d734ec592 100644 --- a/src/test/compile-fail/issue-1193.rs +++ b/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;