about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGuillaumeGomez <guillaume1.gomez@gmail.com>2015-02-03 19:59:29 +0100
committerGuillaumeGomez <guillaume1.gomez@gmail.com>2015-02-06 11:59:10 +0100
commit12f1f4c5467b0f4cbdb66c67eca7e5227dbb1284 (patch)
tree13b22c78016ecf2670f7b444b04f6d944be8c8e0
parentd58c0a75978e068af8b01ab578b743c52635e1f4 (diff)
downloadrust-12f1f4c5467b0f4cbdb66c67eca7e5227dbb1284.tar.gz
rust-12f1f4c5467b0f4cbdb66c67eca7e5227dbb1284.zip
Update HEAD:master
-rw-r--r--src/libsyntax/ext/env.rs2
1 files changed, 1 insertions, 1 deletions
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)
 }