---

GuillaumeGomez · GuillaumeGomez · commit ed3488a2ede3 · 2015-02-06T11:59:10.000+01:00
yaml --- r: 186323 b: refs/heads/try c: 12f1f4c h: refs/heads/master i: 186321: 25b707d 186319: 703837e v: v3
diff --git a/[refs] b/[refs]
@@ -2,7 +2,7 @@
 refs/heads/master: b4c965ee803a4521d8b4575f634e036f93e408f3
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 3a96d6a9818fe2affc98a187fb1065120458cee9
-refs/heads/try: d58c0a75978e068af8b01ab578b743c52635e1f4
+refs/heads/try: 12f1f4c5467b0f4cbdb66c67eca7e5227dbb1284
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
diff --git a/branches/try/src/libsyntax/ext/env.rs b/branches/try/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`	`}`