Skip to content

Commit 4a2d22b

Browse files
committed
fix compilation on macos/windows
1 parent c50d3e3 commit 4a2d22b

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/libstd/rt/args.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ mod imp {
158158
#[cfg(target_os = "macos")]
159159
#[cfg(target_os = "win32")]
160160
mod imp {
161+
use option::Option;
161162

162163
pub unsafe fn init(_argc: int, _argv: **u8) {
163164
}
@@ -176,4 +177,4 @@ mod imp {
176177
pub fn clone() -> Option<~[~str]> {
177178
fail!()
178179
}
179-
}
180+
}

src/test/run-pass/transmute-non-immediate-to-immediate.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313

1414
fn main() {
1515
unsafe {
16-
std::cast::transmute::<[int,..1],int>([1])
16+
::std::cast::transmute::<[int,..1],int>([1])
1717
};
1818
}

0 commit comments

Comments
 (0)