From 12f1f4c5467b0f4cbdb66c67eca7e5227dbb1284 Mon Sep 17 00:00:00 2001
From: GuillaumeGomez <guillaume1.gomez@gmail.com>
Date: Tue, 3 Feb 2015 19:59:29 +0100
Subject: [PATCH] Update HEAD:master

---
 src/libsyntax/ext/env.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libsyntax/ext/env.rs b/src/libsyntax/ext/env.rs
index cd7fbb4fa73..63d563adf26 100644
--- 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)
 }