Skip to content

Commit

Permalink
Bug fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
nrc committed Mar 24, 2015
1 parent c4f3029 commit a7b6af9
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/libstd/sys/windows/os.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/libstd/thread_local/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,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> = {
unsafe extern fn __destroy(ptr: *mut u8) {
Expand Down
2 changes: 1 addition & 1 deletion src/libterm/win.rs
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ impl<T: Write+Send+'static> WinConsole<T> {
}
Some(box WinConsole { buf: out,
def_foreground: fg, def_background: bg,
foreground: fg, background: bg } as Box<Terminal<T>+Send>)
foreground: fg, background: bg })
}
}

Expand Down

0 comments on commit a7b6af9

Please sign in to comment.