From 7e3ee02006ec53ff176fc3490ba01eb2a9c823b8 Mon Sep 17 00:00:00 2001
From: Nick Cameron <ncameron@mozilla.com>
Date: Tue, 24 Mar 2015 13:50:14 +1300
Subject: [PATCH] Bug fixes

---
 src/librustc_typeck/check/coercion.rs | 23 -----------------------
 src/libstd/sys/windows/os.rs          |  2 +-
 src/libstd/thread/local.rs            |  1 +
 src/libterm/win.rs                    |  2 +-
 4 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/src/librustc_typeck/check/coercion.rs b/src/librustc_typeck/check/coercion.rs
index 8ad11e19b347..ae1dbbb1b00a 100644
--- a/src/librustc_typeck/check/coercion.rs
+++ b/src/librustc_typeck/check/coercion.rs
@@ -381,29 +381,6 @@ impl<'f, 'tcx> Coerce<'f, 'tcx> {
                             None
                         }
                     }
-                    (&ty::ty_trait(ref data_a), &ty::ty_trait(ref data_b)) => {
-                        // For now, we only support upcasts from
-                        // `Foo+Send` to `Foo` (really, any time there are
-                        // fewer builtin bounds then before). These are
-                        // convenient because they don't require any sort
-                        // of change to the vtable at runtime.
-                        if data_a.bounds.builtin_bounds != data_b.bounds.builtin_bounds &&
-                            data_a.bounds.builtin_bounds.is_superset(&data_b.bounds.builtin_bounds)
-                        {
-                            let bounds_a1 = ty::ExistentialBounds {
-                                region_bound: data_a.bounds.region_bound,
-                                builtin_bounds: data_b.bounds.builtin_bounds,
-                                projection_bounds: data_a.bounds.projection_bounds.clone(),
-                            };
-                            let ty_a1 = ty::mk_trait(tcx, data_a.principal.clone(), bounds_a1);
-                            match self.fcx.infcx().try(|_| self.subtype(ty_a1, ty_b)) {
-                                Ok(_) => Some((ty_b, ty::UnsizeUpcast(ty_b))),
-                                Err(_) => None,
-                            }
-                        } else {
-                            None
-                        }
-                    }
                     (_, &ty::ty_trait(ref data)) => {
                         Some((ty_b, ty::UnsizeVtable(ty::TyTrait {
                                                          principal: data.principal.clone(),
diff --git a/src/libstd/sys/windows/os.rs b/src/libstd/sys/windows/os.rs
index 83d063717344..167db1e8ac2d 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 1bf1b09681c4..a2b824bb016f 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 {
diff --git a/src/libterm/win.rs b/src/libterm/win.rs
index e29e0e27394d..001313db6769 100644
--- a/src/libterm/win.rs
+++ b/src/libterm/win.rs
@@ -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 })
     }
 }