libsyntax: Fix more merge fallout.
This commit is contained in:
parent
18df18c817
commit
3a66d732bb
|
@ -14,6 +14,8 @@ Simple compression
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
use core::prelude::*;
|
||||||
|
|
||||||
use core::libc::{c_void, size_t, c_int};
|
use core::libc::{c_void, size_t, c_int};
|
||||||
use core::libc;
|
use core::libc;
|
||||||
use core::vec;
|
use core::vec;
|
||||||
|
|
|
@ -299,7 +299,7 @@ impl AstBuilder for @ExtCtxt {
|
||||||
self.path_all(dummy_sp(),
|
self.path_all(dummy_sp(),
|
||||||
true,
|
true,
|
||||||
~[
|
~[
|
||||||
self.ident_of("core"),
|
self.ident_of("std"),
|
||||||
self.ident_of("option"),
|
self.ident_of("option"),
|
||||||
self.ident_of("Option")
|
self.ident_of("Option")
|
||||||
],
|
],
|
||||||
|
@ -537,7 +537,7 @@ impl AstBuilder for @ExtCtxt {
|
||||||
self.expr_call_global(
|
self.expr_call_global(
|
||||||
span,
|
span,
|
||||||
~[
|
~[
|
||||||
self.ident_of("core"),
|
self.ident_of("std"),
|
||||||
self.ident_of("sys"),
|
self.ident_of("sys"),
|
||||||
self.ident_of("FailWithCause"),
|
self.ident_of("FailWithCause"),
|
||||||
self.ident_of("fail_with"),
|
self.ident_of("fail_with"),
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 218ab86721eefd7b7e97fa6d9f95a80a1fa8686c
|
Subproject commit dfae9c3e958dc086d9c0ab068cd76d196c95a433
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
#[start]
|
#[start]
|
||||||
fn start(argc: int, argv: **u8, crate_map: *u8) -> int {
|
fn start(argc: int, argv: **u8, crate_map: *u8) -> int {
|
||||||
do core::rt::start(argc, argv, crate_map) {
|
do std::rt::start(argc, argv, crate_map) {
|
||||||
debug!("creating my own runtime is joy");
|
debug!("creating my own runtime is joy");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue