address review comments

diff --git a/src/librustc_trans/mir/lvalue.rs b/src/librustc_trans/mir/lvalue.rs
index 0c7eeafe86ee01891ac96c284630ed0038769fb6..523dfef5a24095f8693b86c3f4cc540da2831404 100644 (file)
--- a/src/librustc_trans/mir/lvalue.rs
+++ b/src/librustc_trans/mir/lvalue.rs
@@ -199,7 +199,7 @@ pub fn trans_lvalue(&mut self,
                                 let base_ty = self.lvalue_ty(lvalue);
                                 let llbasety = type_of::type_of(bcx.ccx(), base_ty).ptr_to();
                                 let llbase = bcx.pointercast(llbase, llbasety);
-                                (bcx.pointercast(llbase, llbasety), ptr::null_mut())
+                                (llbase, ptr::null_mut())
                             }
                             ty::TySlice(..) => {
                                 assert!(tr_base.llextra != ptr::null_mut());

diff --git a/src/libstd/sys/common/wtf8.rs b/src/libstd/sys/common/wtf8.rs
index 5519230890cb6f84c95b0cb3353fce8cc3a1de33..35e395314480926b8c8289ee0dbc9668da1c971b 100644 (file)
--- a/src/libstd/sys/common/wtf8.rs
+++ b/src/libstd/sys/common/wtf8.rs
@@ -568,7 +568,7 @@ fn final_lead_surrogate(&self) -> Option<u16> {
             return None
         }
         if self.bytes[len-3] == 0xed &&
-            self.bytes[len-2] > 0xa0 &&
+            self.bytes[len-2] >= 0xa0 &&
             self.bytes[len-2] <= 0xaf
         {
             Some(decode_surrogate(self.bytes[len-2], self.bytes[len-1]))
@@ -583,11 +583,11 @@ fn initial_trail_surrogate(&self) -> Option<u16> {
         if len < 3 {
             return None
         }
-        if self.bytes[len-3] == 0xed &&
-            self.bytes[len-2] > 0xb0 &&
-            self.bytes[len-2] <= 0xbf
+        if self.bytes[0] == 0xed &&
+            self.bytes[1] >= 0xb0 &&
+            self.bytes[1] <= 0xbf
         {
-            Some(decode_surrogate(self.bytes[len-2], self.bytes[len-1]))
+            Some(decode_surrogate(self.bytes[1], self.bytes[2]))
         } else {
             None
         }