diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2013-08-27 18:45:13 -0700 |
|---|---|---|
| committer | Patrick Walton <pcwalton@mimiga.net> | 2013-08-27 19:09:27 -0700 |
| commit | aac9d6eee9a1e0b254bf6e035e2e14e5106758bd (patch) | |
| tree | f17cd2853c7661f708058117b190b84f02025dc4 /src/libstd/rt/io | |
| parent | 2bd46e767c0fe5b6188df61cb9daf8f2e65a3ed0 (diff) | |
librustc: Fix merge fallout
Diffstat (limited to 'src/libstd/rt/io')
| -rw-r--r-- | src/libstd/rt/io/file.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/rt/io/file.rs b/src/libstd/rt/io/file.rs index 65db76d5ef7..f4e9c4d7c11 100644 --- a/src/libstd/rt/io/file.rs +++ b/src/libstd/rt/io/file.rs @@ -24,7 +24,7 @@ pub fn open<P: PathLike>(path: &P, access: FileAccess ) -> Option<FileStream> { let open_result = unsafe { - let io = Local::unsafe_borrow::<IoFactoryObject>(); + let io: *mut IoFactoryObject = Local::unsafe_borrow(); (*io).fs_open(path, mode, access) }; match open_result { @@ -43,7 +43,7 @@ pub fn open<P: PathLike>(path: &P, /// by `path`. pub fn unlink<P: PathLike>(path: &P) { let unlink_result = unsafe { - let io = Local::unsafe_borrow::<IoFactoryObject>(); + let io: *mut IoFactoryObject = Local::unsafe_borrow(); (*io).fs_unlink(path) }; match unlink_result { |
