From 60e096a43fcf9df04e4bf38fe3de1d4a1f75ee87 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Fri, 10 Jan 2014 17:55:53 -0800 Subject: [PATCH] rustc: Fix formatting of env! error message Death to caps. --- src/libsyntax/ext/env.rs | 2 +- src/test/compile-fail/extenv-not-defined-default.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libsyntax/ext/env.rs b/src/libsyntax/ext/env.rs index be5560adca8..d7409f6b112 100644 --- a/src/libsyntax/ext/env.rs +++ b/src/libsyntax/ext/env.rs @@ -43,7 +43,7 @@ pub fn expand_env(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree]) let (var, _var_str_style) = expr_to_str(cx, exprs[0], "expected string literal"); let msg = match exprs.len() { - 1 => format!("Environment variable {} not defined", var).to_managed(), + 1 => format!("environment variable `{}` not defined", var).to_managed(), 2 => { let (s, _style) = expr_to_str(cx, exprs[1], "expected string literal"); s diff --git a/src/test/compile-fail/extenv-not-defined-default.rs b/src/test/compile-fail/extenv-not-defined-default.rs index d7a543c045a..24e447eec6d 100644 --- a/src/test/compile-fail/extenv-not-defined-default.rs +++ b/src/test/compile-fail/extenv-not-defined-default.rs @@ -8,4 +8,4 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -fn main() { env!("__HOPEFULLY_NOT_DEFINED__"); } //~ ERROR: Environment variable __HOPEFULLY_NOT_DEFINED__ not defined +fn main() { env!("__HOPEFULLY_NOT_DEFINED__"); } //~ ERROR: environment variable `__HOPEFULLY_NOT_DEFINED__` not defined