diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2013-10-17 21:08:48 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2013-10-24 14:21:58 -0700 |
| commit | 620ab3853abf99ecea3a3d055f47cd6d06433c95 (patch) | |
| tree | 61f35d294ededfa57258fee32e83b54f7f2e0536 /src/libstd/os.rs | |
| parent | 279c35182050889cba42e4adb1438a7f640fdabd (diff) | |
| download | rust-620ab3853abf99ecea3a3d055f47cd6d06433c95.tar.gz rust-620ab3853abf99ecea3a3d055f47cd6d06433c95.zip | |
Test fixes and merge conflicts
Diffstat (limited to 'src/libstd/os.rs')
| -rw-r--r-- | src/libstd/os.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libstd/os.rs b/src/libstd/os.rs index 99930b39a65..1f32c6a0a35 100644 --- a/src/libstd/os.rs +++ b/src/libstd/os.rs @@ -189,6 +189,8 @@ pub fn env() -> ~[(~str,~str)] { #[cfg(windows)] unsafe fn get_env_pairs() -> ~[~str] { #[fixed_stack_segment]; #[inline(never)]; + use c_str; + use str::StrSlice; use libc::funcs::extra::kernel32::{ GetEnvironmentStringsA, @@ -201,7 +203,7 @@ pub fn env() -> ~[(~str,~str)] { } let mut result = ~[]; do c_str::from_c_multistring(ch as *libc::c_char, None) |cstr| { - result.push(cstr.as_str().to_owned()); + result.push(cstr.as_str().unwrap().to_owned()); }; FreeEnvironmentStringsA(ch); result |