nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-28 02:57:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

address review comments

Browse Source
This commit is contained in:
Ariel Ben-Yehuda 2016-06-06 00:20:15 +03:00
parent 5af5f26753
commit 8ac3b46cac
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/librustc_trans/mir/lvalue.rs
View File

@ -199,7 +199,7 @@ impl<'bcx, 'tcx> MirContext<'bcx, 'tcx> {
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());

10
src/libstd/sys/common/wtf8.rs
View File

@ -568,7 +568,7 @@ impl Wtf8 {
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 @@ impl Wtf8 {
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
}