Update HEAD:master

2015-02-03 19:59:29 +01:00
parent d58c0a7597
commit 12f1f4c546
1 changed files with 1 additions and 1 deletions
--- a/src/libsyntax/ext/env.rs
+++ b/src/libsyntax/ext/env.rs
@@ -108,7 +108,7 @@ pub fn expand_env<'cx>(cx: &'cx mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
            cx.span_err(sp, msg.deref());
            cx.expr_usize(sp, 0)
        }
-        Ok(s) => cx.expr_str(sp, token::intern_and_get_ident(&s[]))
+        Some(s) => cx.expr_str(sp, token::intern_and_get_ident(&s[]))
    };
    MacExpr::new(e)
 }