---

GuillaumeGomez · GuillaumeGomez · commit d002217c4a9b · 2015-02-05T13:36:48.000+01:00
yaml --- r: 178923 b: refs/heads/tmp c: 7f2785df6554f203298c624b236b8c62394f378e h: refs/heads/master i: 178921: 5e230ad 178919: 840e67e v: v3
diff --git a/[refs] b/[refs]
@@ -34,4 +34,4 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
 refs/heads/beta: 44a287e6eb22ec3c2a687fc156813577464017f7
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: 384d61a3949fcd381c2f070fae67c3c9324527aa
+refs/heads/tmp: 7f2785df6554f203298c624b236b8c62394f378e
diff --git a/branches/tmp/src/libsyntax/ext/env.rs b/branches/tmp/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`	`}`