---

GuillaumeGomez · GuillaumeGomez · commit b9153e77a9ac · 2015-02-06T11:59:10.000+01:00
yaml --- r: 179180 b: refs/heads/auto c: 12f1f4c h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: d58c0a75978e068af8b01ab578b743c52635e1f4
+refs/heads/auto: 12f1f4c5467b0f4cbdb66c67eca7e5227dbb1284
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
diff --git a/branches/auto/src/libsyntax/ext/env.rs b/branches/auto/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`	`}`