Skip to content

Commit a7b6af9

Browse files
committed
Bug fixes
1 parent c4f3029 commit a7b6af9

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

src/libstd/sys/windows/os.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ impl Iterator for Env {
109109
if *self.cur == 0 { return None }
110110
let p = &*self.cur;
111111
let mut len = 0;
112-
while *(p as *const _).offset(len) != 0 {
112+
while *(p as *const u16).offset(len) != 0 {
113113
len += 1;
114114
}
115115
let p = p as *const u16;

src/libstd/thread_local/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ macro_rules! __thread_local_inner {
203203
}
204204
};
205205

206+
#[allow(trivial_casts)]
206207
#[cfg(any(not(any(target_os = "macos", target_os = "linux")), target_arch = "aarch64"))]
207208
const _INIT: ::std::thread_local::__impl::KeyInner<$t> = {
208209
unsafe extern fn __destroy(ptr: *mut u8) {

src/libterm/win.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ impl<T: Write+Send+'static> WinConsole<T> {
126126
}
127127
Some(box WinConsole { buf: out,
128128
def_foreground: fg, def_background: bg,
129-
foreground: fg, background: bg } as Box<Terminal<T>+Send>)
129+
foreground: fg, background: bg })
130130
}
131131
}
132132

0 commit comments

Comments
 (0)