diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2013-11-22 14:15:32 -0800 |
|---|---|---|
| committer | Patrick Walton <pcwalton@mimiga.net> | 2013-11-26 08:25:27 -0800 |
| commit | 151b7ed52d76a11a39888931056f1bcc9c45807a (patch) | |
| tree | 614d773bfa0bcb8c1b93d4a6c4f824780f925f5b /src/libstd/rt | |
| parent | 749ee53c6d23ae1467568d6e0280a4f59e4e952b (diff) | |
| download | rust-151b7ed52d76a11a39888931056f1bcc9c45807a.tar.gz rust-151b7ed52d76a11a39888931056f1bcc9c45807a.zip | |
libstd: Fix Win32 and other bustage.
Diffstat (limited to 'src/libstd/rt')
| -rw-r--r-- | src/libstd/rt/args.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libstd/rt/args.rs b/src/libstd/rt/args.rs index a173be64356..82b98fa7f9a 100644 --- a/src/libstd/rt/args.rs +++ b/src/libstd/rt/args.rs @@ -109,16 +109,16 @@ mod imp { fn with_lock<T>(f: || -> T) -> T { static mut lock: Mutex = MUTEX_INIT; - do (|| { + (|| { unsafe { lock.lock(); f() } - }).finally { + }).finally(|| { unsafe { lock.unlock(); } - } + }) } fn get_global_ptr() -> *mut Option<~~[~str]> { @@ -127,9 +127,9 @@ mod imp { // Copied from `os`. unsafe fn load_argc_and_argv(argc: int, argv: **u8) -> ~[~str] { - do vec::from_fn(argc as uint) |i| { + vec::from_fn(argc as uint, |i| { str::raw::from_c_str(*(argv as **libc::c_char).offset(i as int)) - } + }) } #[cfg(test)] |
