diff options
| author | Nick Cameron <ncameron@mozilla.com> | 2015-03-24 13:50:14 +1300 |
|---|---|---|
| committer | Nick Cameron <ncameron@mozilla.com> | 2015-03-25 10:37:03 +1300 |
| commit | 7e3ee02006ec53ff176fc3490ba01eb2a9c823b8 (patch) | |
| tree | f2eb7fc20a87d794676517f672ea94506dbeff09 /src/libstd | |
| parent | e7122a5a09d06aedd1d27d14c3ac38c40b0a7425 (diff) | |
| download | rust-7e3ee02006ec53ff176fc3490ba01eb2a9c823b8.tar.gz rust-7e3ee02006ec53ff176fc3490ba01eb2a9c823b8.zip | |
Bug fixes
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/sys/windows/os.rs | 2 | ||||
| -rw-r--r-- | src/libstd/thread/local.rs | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/libstd/sys/windows/os.rs b/src/libstd/sys/windows/os.rs index 83d06371734..167db1e8ac2 100644 --- a/src/libstd/sys/windows/os.rs +++ b/src/libstd/sys/windows/os.rs @@ -109,7 +109,7 @@ impl Iterator for Env { if *self.cur == 0 { return None } let p = &*self.cur; let mut len = 0; - while *(p as *const _).offset(len) != 0 { + while *(p as *const u16).offset(len) != 0 { len += 1; } let p = p as *const u16; diff --git a/src/libstd/thread/local.rs b/src/libstd/thread/local.rs index 1bf1b09681c..a2b824bb016 100644 --- a/src/libstd/thread/local.rs +++ b/src/libstd/thread/local.rs @@ -176,6 +176,7 @@ macro_rules! __thread_local_inner { } }; + #[allow(trivial_casts)] #[cfg(any(not(any(target_os = "macos", target_os = "linux")), target_arch = "aarch64"))] const _INIT: ::std::thread::__local::__impl::KeyInner<$t> = { ::std::thread::__local::__impl::KeyInner { |