Skip to content

Commit 8ac3b46

Browse files
committed
address review comments
1 parent 5af5f26 commit 8ac3b46

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/librustc_trans/mir/lvalue.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ impl<'bcx, 'tcx> MirContext<'bcx, 'tcx> {
199199
let base_ty = self.lvalue_ty(lvalue);
200200
let llbasety = type_of::type_of(bcx.ccx(), base_ty).ptr_to();
201201
let llbase = bcx.pointercast(llbase, llbasety);
202-
(bcx.pointercast(llbase, llbasety), ptr::null_mut())
202+
(llbase, ptr::null_mut())
203203
}
204204
ty::TySlice(..) => {
205205
assert!(tr_base.llextra != ptr::null_mut());

src/libstd/sys/common/wtf8.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ impl Wtf8 {
568568
return None
569569
}
570570
if self.bytes[len-3] == 0xed &&
571-
self.bytes[len-2] > 0xa0 &&
571+
self.bytes[len-2] >= 0xa0 &&
572572
self.bytes[len-2] <= 0xaf
573573
{
574574
Some(decode_surrogate(self.bytes[len-2], self.bytes[len-1]))
@@ -583,11 +583,11 @@ impl Wtf8 {
583583
if len < 3 {
584584
return None
585585
}
586-
if self.bytes[len-3] == 0xed &&
587-
self.bytes[len-2] > 0xb0 &&
588-
self.bytes[len-2] <= 0xbf
586+
if self.bytes[0] == 0xed &&
587+
self.bytes[1] >= 0xb0 &&
588+
self.bytes[1] <= 0xbf
589589
{
590-
Some(decode_surrogate(self.bytes[len-2], self.bytes[len-1]))
590+
Some(decode_surrogate(self.bytes[1], self.bytes[2]))
591591
} else {
592592
None
593593
}

0 commit comments

Comments
 (0)