From 9968ae255495704cb0c3fc1f43d2df2e84c20d5e Mon Sep 17 00:00:00 2001 From: Jonas Hietala Date: Sat, 23 Aug 2014 12:41:32 +0200 Subject: Adjust the error messages to match the pattern "expected foo, found bar" Closes #8492 --- src/libsyntax/ext/asm.rs | 2 +- src/libsyntax/ext/format.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/libsyntax/ext') diff --git a/src/libsyntax/ext/asm.rs b/src/libsyntax/ext/asm.rs index 43fa0964f80..180f2409b8a 100644 --- a/src/libsyntax/ext/asm.rs +++ b/src/libsyntax/ext/asm.rs @@ -151,7 +151,7 @@ pub fn expand_asm(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree]) clobs.push(clob); if OPTIONS.iter().any(|opt| s.equiv(opt)) { - cx.span_warn(p.last_span, "expected a clobber, but found an option"); + cx.span_warn(p.last_span, "expected a clobber, found an option"); } } diff --git a/src/libsyntax/ext/format.rs b/src/libsyntax/ext/format.rs index 835181d55c4..124e9e95942 100644 --- a/src/libsyntax/ext/format.rs +++ b/src/libsyntax/ext/format.rs @@ -128,7 +128,7 @@ fn parse_args(ecx: &mut ExtCtxt, sp: Span, allow_method: bool, } _ => { ecx.span_err(p.span, - format!("expected ident for named argument, but found `{}`", + format!("expected ident for named argument, found `{}`", p.this_token_to_string()).as_slice()); return (invocation, None); } -- cgit 1.4.1-3-g733a5