diff options
| author | Daniel Micay <danielmicay@gmail.com> | 2013-07-24 01:48:11 -0400 |
|---|---|---|
| committer | Daniel Micay <danielmicay@gmail.com> | 2013-07-24 09:45:21 -0400 |
| commit | 4a2d22bdb1292fe2c4b415671def7959adf36920 (patch) | |
| tree | 7decd525e755308e04da3a315911bdf4b1339e7e | |
| parent | c50d3e3fca5760fff19f6c8304c608d2b41eba45 (diff) | |
| download | rust-4a2d22bdb1292fe2c4b415671def7959adf36920.tar.gz rust-4a2d22bdb1292fe2c4b415671def7959adf36920.zip | |
fix compilation on macos/windows
| -rw-r--r-- | src/libstd/rt/args.rs | 3 | ||||
| -rw-r--r-- | src/test/run-pass/transmute-non-immediate-to-immediate.rs | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/libstd/rt/args.rs b/src/libstd/rt/args.rs index f1a9c6023b9..85cdb9fc941 100644 --- a/src/libstd/rt/args.rs +++ b/src/libstd/rt/args.rs @@ -158,6 +158,7 @@ mod imp { #[cfg(target_os = "macos")] #[cfg(target_os = "win32")] mod imp { + use option::Option; pub unsafe fn init(_argc: int, _argv: **u8) { } @@ -176,4 +177,4 @@ mod imp { pub fn clone() -> Option<~[~str]> { fail!() } -} \ No newline at end of file +} diff --git a/src/test/run-pass/transmute-non-immediate-to-immediate.rs b/src/test/run-pass/transmute-non-immediate-to-immediate.rs index 57844e7d860..2f097bc90a9 100644 --- a/src/test/run-pass/transmute-non-immediate-to-immediate.rs +++ b/src/test/run-pass/transmute-non-immediate-to-immediate.rs @@ -13,6 +13,6 @@ fn main() { unsafe { - std::cast::transmute::<[int,..1],int>([1]) + ::std::cast::transmute::<[int,..1],int>([1]) }; } |