bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #53313 - llogiq:two-small-improvements, r=estebank

Browse source 
Two small improvements

In `librustc_apfloat/ieee.rs`, use the iterator.[r]find methods to simplify the code. In `libserialize/json.rs`, make use of the fact that `Vec.last` on an empty `Vec` returns `None` to simplify the code to a single match.
This commit is contained in:
kennytm 2018-08-17 00:13:20 +08:00 • committed by GitHub
commit e6068828bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/librustc_apfloat/ieee.rs
View file

@ -2306,24 +2306,14 @@ mod sig {
/// One, not zero, based LSB. That is, returns 0 for a zeroed significand.
pub(super) fn olsb(limbs: &[Limb]) -> usize {
for (i, &limb) in limbs.iter().enumerate() {
if limb != 0 {
return i * LIMB_BITS + limb.trailing_zeros() as usize + 1;
}
}
0
limbs.iter().enumerate().find(|(_, &limb)| limb != 0).map_or(0,
|(i, limb)| i * LIMB_BITS + limb.trailing_zeros() as usize + 1)
}
/// One, not zero, based MSB. That is, returns 0 for a zeroed significand.
pub(super) fn omsb(limbs: &[Limb]) -> usize {
for (i, &limb) in limbs.iter().enumerate().rev() {
if limb != 0 {
return (i + 1) * LIMB_BITS - limb.leading_zeros() as usize;
}
}
0
limbs.iter().enumerate().rfind(|(_, &limb)| limb != 0).map_or(0,
|(i, limb)| (i + 1) * LIMB_BITS - limb.leading_zeros() as usize)
}
/// Comparison (unsigned) of two significands.

7
src/libserialize/json.rs
View file

@ -1390,10 +1390,9 @@ impl Stack {
// Used by Parser to test whether the top-most element is an index.
fn last_is_index(&self) -> bool {
if let Some(InternalIndex(_)) = self.stack.last() {
true
} else {
false
match self.stack.last() {
Some(InternalIndex(_)) => true,
_ => false,
}
}