---

thestinger · thestinger · commit a6b3c3a95c97 · 2013-07-24T09:45:21.000-04:00
yaml --- r: 67275 b: refs/heads/master c: 4a2d22b h: refs/heads/master i: 67273: 5577a45 67271: 069da17 v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: c50d3e3fca5760fff19f6c8304c608d2b41eba45
+refs/heads/master: 4a2d22bdb1292fe2c4b415671def7959adf36920
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
diff --git a/trunk/src/libstd/rt/args.rs b/trunk/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!()
     }
-}
+}
diff --git a/trunk/src/test/run-pass/transmute-non-immediate-to-immediate.rs b/trunk/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])
     };
 }

Original file line number	Diff line number	Diff line change
`@@ -158,6 +158,7 @@ mod imp {`
`158`	`158`	`#[cfg(target_os = "macos")]`
`159`	`159`	`#[cfg(target_os = "win32")]`
`160`	`160`	`mod imp {`
	`161`	`+ use option::Option;`
`161`	`162`
`162`	`163`	`pub unsafe fn init(_argc: int, _argv: **u8) {`
`163`	`164`	`}`
`@@ -176,4 +177,4 @@ mod imp {`
`176`	`177`	`pub fn clone() -> Option<~[~str]> {`
`177`	`178`	`fail!()`
`178`	`179`	`}`
`179`		`-}`
	`180`	`+}`