bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

libsyntax: Fix more merge fallout.

Browse source
This commit is contained in:
Patrick Walton 2013-05-22 11:02:40 -07:00
parent 18df18c817
commit 3a66d732bb
4 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libsyntax/ext/build.rs
View file

@ -299,7 +299,7 @@ impl AstBuilder for @ExtCtxt {
self.path_all(dummy_sp(),
true,
~[
self.ident_of("core"),
self.ident_of("std"),
self.ident_of("option"),
self.ident_of("Option")
],
@ -537,7 +537,7 @@ impl AstBuilder for @ExtCtxt {
self.expr_call_global(
span,
~[
self.ident_of("core"),
self.ident_of("std"),
self.ident_of("sys"),
self.ident_of("FailWithCause"),
self.ident_of("fail_with"),