T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clippy fixes (#692)

Browse Source
This commit is contained in:
XAMPPRocky
2019-12-24 20:50:07 +00:00
committed by Dan Gohman
parent 6c97cfed1e
commit 907e7aac01
35 changed files with 390 additions and 417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/wast/src/spectest.rs
View File

@@ -86,11 +86,11 @@ pub fn instantiate_spectest(store: &HostRef<Store>) -> HashMap<&'static str, Ext
ret.insert("global_i64", Extern::Global(HostRef::new(g)));
let ty = GlobalType::new(ValType::F32, Mutability::Const);
let g = Global::new(store, ty, Val::F32(0x44268000));
let g = Global::new(store, ty, Val::F32(0x4426_8000));
ret.insert("global_f32", Extern::Global(HostRef::new(g)));
let ty = GlobalType::new(ValType::F64, Mutability::Const);
let g = Global::new(store, ty, Val::F64(0x4084d00000000000));
let g = Global::new(store, ty, Val::F64(0x4084_d000_0000_0000));
ret.insert("global_f64", Extern::Global(HostRef::new(g)));
let ty = TableType::new(ValType::FuncRef, Limits::new(10, Some(20)));

34
crates/wast/src/wast.rs
View File

@@ -301,12 +301,12 @@ impl WastContext {
for v in values.iter() {
match v {
Val::F32(x) => {
if !is_canonical_f32_nan(x) {
if !is_canonical_f32_nan(*x) {
bail!("{}\nexpected canonical NaN", context(span))
}
}
Val::F64(x) => {
if !is_canonical_f64_nan(x) {
if !is_canonical_f64_nan(*x) {
bail!("{}\nexpected canonical NaN", context(span))
}
}
@@ -329,7 +329,7 @@ impl WastContext {
other => bail!("expected v128, got {:?}", other),
};
for l in 0..4 {
if !is_canonical_f32_nan(&extract_lane_as_u32(val, l)?) {
if !is_canonical_f32_nan(extract_lane_as_u32(val, l)?) {
bail!(
"{}\nexpected f32x4 canonical NaN in lane {}",
context(span),
@@ -354,7 +354,7 @@ impl WastContext {
other => bail!("expected v128, got {:?}", other),
};
for l in 0..2 {
if !is_canonical_f64_nan(&extract_lane_as_u64(val, l)?) {
if !is_canonical_f64_nan(extract_lane_as_u64(val, l)?) {
bail!(
"{}\nexpected f64x2 canonical NaN in lane {}",
context(span),
@@ -376,12 +376,12 @@ impl WastContext {
for v in values.iter() {
match v {
Val::F32(x) => {
if !is_arithmetic_f32_nan(x) {
if !is_arithmetic_f32_nan(*x) {
bail!("{}\nexpected arithmetic NaN", context(span))
}
}
Val::F64(x) => {
if !is_arithmetic_f64_nan(x) {
if !is_arithmetic_f64_nan(*x) {
bail!("{}\nexpected arithmetic NaN", context(span))
}
}
@@ -404,7 +404,7 @@ impl WastContext {
other => bail!("expected v128, got {:?}", other),
};
for l in 0..4 {
if !is_arithmetic_f32_nan(&extract_lane_as_u32(val, l)?) {
if !is_arithmetic_f32_nan(extract_lane_as_u32(val, l)?) {
bail!(
"{}\nexpected f32x4 arithmetic NaN in lane {}",
context(span),
@@ -429,7 +429,7 @@ impl WastContext {
other => bail!("expected v128, got {:?}", other),
};
for l in 0..2 {
if !is_arithmetic_f64_nan(&extract_lane_as_u64(val, l)?) {
if !is_arithmetic_f64_nan(extract_lane_as_u64(val, l)?) {
bail!(
"{}\nexpected f64x2 arithmetic NaN in lane {}",
context(span),
@@ -538,20 +538,22 @@ fn extract_lane_as_u64(bytes: &u128, lane: usize) -> Result<u64> {
Ok((*bytes >> (lane * 64)) as u64)
}
fn is_canonical_f32_nan(bits: &u32) -> bool {
return (bits & 0x7fffffff) == 0x7fc00000;
fn is_canonical_f32_nan(bits: u32) -> bool {
(bits & 0x7fff_ffff) == 0x7fc0_0000
}
fn is_canonical_f64_nan(bits: &u64) -> bool {
return (bits & 0x7fffffffffffffff) == 0x7ff8000000000000;
fn is_canonical_f64_nan(bits: u64) -> bool {
(bits & 0x7fff_ffff_ffff_ffff) == 0x7ff8_0000_0000_0000
}
fn is_arithmetic_f32_nan(bits: &u32) -> bool {
return (bits & 0x00400000) == 0x00400000;
fn is_arithmetic_f32_nan(bits: u32) -> bool {
const AF32_NAN: u32 = 0x0040_0000;
(bits & AF32_NAN) == AF32_NAN
}
fn is_arithmetic_f64_nan(bits: &u64) -> bool {
return (bits & 0x0008000000000000) == 0x0008000000000000;
fn is_arithmetic_f64_nan(bits: u64) -> bool {
const AF64_NAN: u64 = 0x0008_0000_0000_0000;
(bits & AF64_NAN) == AF64_NAN
}
fn values_equal(v1: &Val, v2: &Val) -> Result<bool> {