---

thestinger · thestinger · commit 87d37cab24ae · 2013-07-24T09:45:21.000-04:00
yaml --- r: 69321 b: refs/heads/auto c: 4a2d22b h: refs/heads/master i: 69319: f65997e v: v3
diff --git a/[refs] b/[refs]
@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: c50d3e3fca5760fff19f6c8304c608d2b41eba45
+refs/heads/auto: 4a2d22bdb1292fe2c4b415671def7959adf36920
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
diff --git a/branches/auto/src/libstd/rt/args.rs b/branches/auto/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/branches/auto/src/test/run-pass/transmute-non-immediate-to-immediate.rs b/branches/auto/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`	`+}`