Update HEAD:master

GuillaumeGomez · GuillaumeGomez · commit 12f1f4c5467b · 2015-02-06T11:59:10.000+01:00
diff --git 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)
 }

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ pub fn expand_env<'cx>(cx: &'cx mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])`
`108`	`108`	`cx.span_err(sp, msg.deref());`
`109`	`109`	`cx.expr_usize(sp, 0)`
`110`	`110`	`}`
`111`		`- Ok(s) => cx.expr_str(sp, token::intern_and_get_ident(&s[]))`
	`111`	`+ Some(s) => cx.expr_str(sp, token::intern_and_get_ident(&s[]))`
`112`	`112`	`};`
`113`	`113`	`MacExpr::new(e)`
`114`	`114`	`}`