Skip to content

Commit

Permalink
Merge pull request #1564 from ltratt/clippy_test_fixes
Browse files Browse the repository at this point in the history 
Clippy fixes
  • Loading branch information
@vext01
vext01 authored Jan 24, 2025
2 parents f02aabc + 0db0814 commit 01349d5
Show file tree
Hide file tree
Showing 7 changed files with 57 additions and 55 deletions.
2 changes: 1 addition & 1 deletion .buildbot.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ for tracer in ${TRACERS}; do
echo "$WARNING_DEFINES" | xargs cargo rustc -p xtask --profile check --bin xtask --

# Error if Clippy detects any warnings introduced in lines changed in this PR.
cargo-clippy-diff origin/master -- --all-features -- -D warnings
cargo-clippy-diff origin/master -- --all-features --tests -- -D warnings
done

# Run the tests multiple times on hwt to try and catch non-deterministic
Expand Down
4 changes: 3 additions & 1 deletion ykrt/src/compile/jitc_yk/aot_ir.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2073,7 +2073,9 @@ mod tests {
bytes,
};

let expect_bytes = rng.rev().map(|i| format!("{:02x}", i)).collect::<String>();
let expect_bytes = rng
.rev()
.fold("".to_string(), |acc, i| format!("{acc}{i:02x}"));
let expect_usize = usize::from_str_radix(&expect_bytes, 16).unwrap();
assert_eq!(
format!("{}", cp.display(&m)),
Expand Down
76 changes: 38 additions & 38 deletions ykrt/src/compile/jitc_yk/arbbitint.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,82 +265,82 @@ mod tests {
assert_eq!(
ArbBitInt::from_i64(8, x as i64)
.wrapping_add(&ArbBitInt::from_i64(8, y as i64)).to_sign_ext_i8(),
i8::try_from(x.wrapping_add(y)).ok()
Some(x.wrapping_add(y))
);
// i16
assert_eq!(
ArbBitInt::from_i64(8, x as i64)
.wrapping_add(&ArbBitInt::from_i64(8, y as i64)).to_sign_ext_i16(),
i16::try_from(x.wrapping_add(y)).ok()
Some(i16::from(x.wrapping_add(y)))
);

// wrapping_sub
// i8
assert_eq!(
ArbBitInt::from_i64(8, x as i64)
.wrapping_sub(&ArbBitInt::from_i64(8, y as i64)).to_sign_ext_i8(),
i8::try_from(x.wrapping_sub(y)).ok()
Some(x.wrapping_sub(y))
);
// i16
assert_eq!(
ArbBitInt::from_i64(8, x as i64)
.wrapping_sub(&ArbBitInt::from_i64(8, y as i64)).to_sign_ext_i16(),
i16::try_from(x.wrapping_sub(y)).ok()
Some(i16::from(x.wrapping_sub(y)))
);

// wrapping_mul
// i8
assert_eq!(
ArbBitInt::from_i64(8, x as i64)
.wrapping_mul(&ArbBitInt::from_i64(8, y as i64)).to_sign_ext_i8(),
i8::try_from(x.wrapping_mul(y)).ok()
Some(x.wrapping_mul(y))
);
// i16
assert_eq!(
ArbBitInt::from_i64(8, x as i64)
.wrapping_mul(&ArbBitInt::from_i64(8, y as i64)).to_sign_ext_i16(),
i16::try_from(x.wrapping_mul(y)).ok()
Some(i16::from(x.wrapping_mul(y)))
);

// bitadd
assert_eq!(
ArbBitInt::from_i64(8, x as i64)
.bitand(&ArbBitInt::from_i64(8, y as i64)).to_sign_ext_i8(),
i8::try_from(x.bitand(y)).ok()
Some(x.bitand(y))
);
// i16
assert_eq!(
ArbBitInt::from_i64(8, x as i64)
.bitand(&ArbBitInt::from_i64(8, y as i64)).to_sign_ext_i16(),
i16::try_from(x.bitand(y)).ok()
Some(i16::from(x.bitand(y)))
);

// bitor
// i16
assert_eq!(
ArbBitInt::from_i64(8, x as i64)
.bitor(&ArbBitInt::from_i64(8, y as i64)).to_sign_ext_i8(),
i8::try_from(x.bitor(y)).ok()
Some(x.bitor(y))
);
// i16
assert_eq!(
ArbBitInt::from_i64(8, x as i64)
.bitor(&ArbBitInt::from_i64(8, y as i64)).to_sign_ext_i16(),
i16::try_from(x.bitor(y)).ok()
Some(i16::from(x.bitor(y)))
);

// bitxor
// i8
assert_eq!(
ArbBitInt::from_i64(8, x as i64)
.bitxor(&ArbBitInt::from_i64(8, y as i64)).to_sign_ext_i8(),
i8::try_from(x.bitxor(y)).ok()
Some(x.bitxor(y))
);
// i16
assert_eq!(
ArbBitInt::from_i64(8, x as i64)
.bitxor(&ArbBitInt::from_i64(8, y as i64)).to_sign_ext_i16(),
i16::try_from(x.bitxor(y)).ok()
Some(i16::from(x.bitxor(y)))
);
}

Expand All @@ -364,7 +364,7 @@ mod tests {
assert_eq!(
ArbBitInt::from_i64(16, x as i64)
.wrapping_add(&ArbBitInt::from_i64(16, y as i64)).to_sign_ext_i16(),
i16::try_from(x.wrapping_add(y)).ok()
Some(x.wrapping_add(y))
);

// wrapping_sub
Expand All @@ -378,7 +378,7 @@ mod tests {
assert_eq!(
ArbBitInt::from_i64(16, x as i64)
.wrapping_sub(&ArbBitInt::from_i64(16, y as i64)).to_sign_ext_i16(),
i16::try_from(x.wrapping_sub(y)).ok()
Some(x.wrapping_sub(y))
);

// wrapping_mul
Expand All @@ -392,7 +392,7 @@ mod tests {
assert_eq!(
ArbBitInt::from_i64(16, x as i64)
.wrapping_mul(&ArbBitInt::from_i64(16, y as i64)).to_sign_ext_i16(),
i16::try_from(x.wrapping_mul(y)).ok()
Some(x.wrapping_mul(y))
);

// bitand
Expand All @@ -406,7 +406,7 @@ mod tests {
assert_eq!(
ArbBitInt::from_i64(16, x as i64)
.bitand(&ArbBitInt::from_i64(16, y as i64)).to_sign_ext_i16(),
i16::try_from(x.bitand(y)).ok()
Some(x.bitand(y))
);

// bitor
Expand All @@ -420,7 +420,7 @@ mod tests {
assert_eq!(
ArbBitInt::from_i64(16, x as i64)
.bitor(&ArbBitInt::from_i64(16, y as i64)).to_sign_ext_i16(),
i16::try_from(x.bitor(y)).ok()
Some(x.bitor(y))
);

// bitxor
Expand All @@ -434,7 +434,7 @@ mod tests {
assert_eq!(
ArbBitInt::from_i64(16, x as i64)
.bitxor(&ArbBitInt::from_i64(16, y as i64)).to_sign_ext_i16(),
i16::try_from(x.bitxor(y)).ok()
Some(x.bitxor(y))
);
}

Expand Down Expand Up @@ -469,7 +469,7 @@ mod tests {
assert_eq!(
ArbBitInt::from_i64(32, x as i64)
.wrapping_add(&ArbBitInt::from_i64(32, y as i64)).to_sign_ext_i32(),
i32::try_from(x.wrapping_add(y)).ok()
Some(x.wrapping_add(y))
);

// wrapping_sub
Expand All @@ -489,7 +489,7 @@ mod tests {
assert_eq!(
ArbBitInt::from_i64(32, x as i64)
.wrapping_sub(&ArbBitInt::from_i64(32, y as i64)).to_sign_ext_i32(),
i32::try_from(x.wrapping_sub(y)).ok()
Some(x.wrapping_sub(y))
);

// wrapping_mul
Expand All @@ -509,7 +509,7 @@ mod tests {
assert_eq!(
ArbBitInt::from_i64(32, x as i64)
.wrapping_mul(&ArbBitInt::from_i64(32, y as i64)).to_sign_ext_i32(),
i32::try_from(x.wrapping_mul(y)).ok()
Some(x.wrapping_mul(y))
);

// bitand
Expand All @@ -529,7 +529,7 @@ mod tests {
assert_eq!(
ArbBitInt::from_i64(32, x as i64)
.bitand(&ArbBitInt::from_i64(32, y as i64)).to_sign_ext_i32(),
i32::try_from(x.bitand(y)).ok()
Some(x.bitand(y))
);

// bitor
Expand All @@ -549,7 +549,7 @@ mod tests {
assert_eq!(
ArbBitInt::from_i64(32, x as i64)
.bitor(&ArbBitInt::from_i64(32, y as i64)).to_sign_ext_i32(),
i32::try_from(x.bitor(y)).ok()
Some(x.bitor(y))
);

// bitxor
Expand All @@ -569,7 +569,7 @@ mod tests {
assert_eq!(
ArbBitInt::from_i64(32, x as i64)
.bitxor(&ArbBitInt::from_i64(32, y as i64)).to_sign_ext_i32(),
i32::try_from(x.bitxor(y)).ok()
Some(x.bitxor(y))
);
}

Expand Down Expand Up @@ -615,7 +615,7 @@ mod tests {
assert_eq!(
ArbBitInt::from_i64(64, x)
.wrapping_add(&ArbBitInt::from_i64(64, y)).to_sign_ext_i64(),
i64::try_from(x.wrapping_add(y)).ok()
Some(x.wrapping_add(y))
);

// wrapping_sub
Expand All @@ -641,7 +641,7 @@ mod tests {
assert_eq!(
ArbBitInt::from_i64(64, x)
.wrapping_sub(&ArbBitInt::from_i64(64, y)).to_sign_ext_i64(),
i64::try_from(x.wrapping_sub(y)).ok()
Some(x.wrapping_sub(y))
);

// wrapping_mul
Expand All @@ -667,7 +667,7 @@ mod tests {
assert_eq!(
ArbBitInt::from_i64(64, x)
.wrapping_mul(&ArbBitInt::from_i64(64, y)).to_sign_ext_i64(),
i64::try_from(x.wrapping_mul(y)).ok()
Some(x.wrapping_mul(y))
);

// bitand
Expand All @@ -693,7 +693,7 @@ mod tests {
assert_eq!(
ArbBitInt::from_i64(64, x)
.bitand(&ArbBitInt::from_i64(64, y)).to_sign_ext_i64(),
i64::try_from(x.bitand(y)).ok()
Some(x.bitand(y))
);

// bitor
Expand All @@ -719,7 +719,7 @@ mod tests {
assert_eq!(
ArbBitInt::from_i64(64, x)
.bitor(&ArbBitInt::from_i64(64, y)).to_sign_ext_i64(),
i64::try_from(x.bitor(y)).ok()
Some(x.bitor(y))
);

// bitxor
Expand All @@ -745,7 +745,7 @@ mod tests {
assert_eq!(
ArbBitInt::from_i64(64, x)
.bitxor(&ArbBitInt::from_i64(64, y)).to_sign_ext_i64(),
i64::try_from(x.bitxor(y)).ok()
Some(x.bitxor(y))
);
}

Expand All @@ -756,7 +756,7 @@ mod tests {
// "failure cases only".
assert_eq!(
ArbBitInt::from_u64(8, x as u64).checked_shl(y).map(|x| x.to_zero_ext_u8()),
x.checked_shl(y).map(|x| u8::try_from(x).ok())
x.checked_shl(y).map(Some)
);
}

Expand All @@ -767,7 +767,7 @@ mod tests {
// "failure cases only".
assert_eq!(
ArbBitInt::from_u64(16, x as u64).checked_shl(y).map(|x| x.to_zero_ext_u16()),
x.checked_shl(y).map(|x| u16::try_from(x).ok())
x.checked_shl(y).map(Some)
);
}

Expand All @@ -778,7 +778,7 @@ mod tests {
// "failure cases only".
assert_eq!(
ArbBitInt::from_u64(32, x as u64).checked_shl(y).map(|x| x.to_zero_ext_u32()),
x.checked_shl(y).map(|x| u32::try_from(x).ok())
x.checked_shl(y).map(Some)
);
}

Expand All @@ -789,7 +789,7 @@ mod tests {
// "failure cases only".
assert_eq!(
ArbBitInt::from_u64(64, x).checked_shl(y).map(|x| x.to_zero_ext_u64()),
x.checked_shl(y).map(|x| u64::try_from(x).ok())
x.checked_shl(y).map(Some)
);
}

Expand All @@ -800,7 +800,7 @@ mod tests {
// "failure cases only".
assert_eq!(
ArbBitInt::from_u64(8, x as u64).checked_shr(y).map(|x| x.to_zero_ext_u8()),
x.checked_shr(y).map(|x| u8::try_from(x).ok())
x.checked_shr(y).map(Some)
);
}

Expand All @@ -811,7 +811,7 @@ mod tests {
// "failure cases only".
assert_eq!(
ArbBitInt::from_u64(16, x as u64).checked_shr(y).map(|x| x.to_zero_ext_u16()),
x.checked_shr(y).map(|x| u16::try_from(x).ok())
x.checked_shr(y).map(Some)
);
}

Expand All @@ -822,7 +822,7 @@ mod tests {
// "failure cases only".
assert_eq!(
ArbBitInt::from_u64(32, x as u64).checked_shr(y).map(|x| x.to_zero_ext_u32()),
x.checked_shr(y).map(|x| u32::try_from(x).ok())
x.checked_shr(y).map(Some)
);
}

Expand All @@ -833,7 +833,7 @@ mod tests {
// "failure cases only".
assert_eq!(
ArbBitInt::from_u64(64, x).checked_shr(y).map(|x| x.to_zero_ext_u64()),
x.checked_shr(y).map(|x| u64::try_from(x).ok())
x.checked_shr(y).map(Some)
);
}
}
Expand Down
8 changes: 4 additions & 4 deletions ykrt/src/compile/jitc_yk/codegen/x64/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2803,7 +2803,7 @@ mod tests {
let mut map = HashMap::new();
for (i, regs) in X64_RAW_REGS_MAP.iter().enumerate() {
for r in regs.iter() {
if *r != "" {
if !r.is_empty() {
map.insert(*r, i);
}
}
Expand Down Expand Up @@ -2833,7 +2833,7 @@ mod tests {
};
}

fn fmatcher<'a>(ptn: &'a str) -> FMatcher<'a> {
fn fmatcher(ptn: &str) -> FMatcher<'_> {
let mut fmb = FMBuilder::new(ptn)
.unwrap()
.name_matching_validator(|names| {
Expand Down Expand Up @@ -4714,11 +4714,11 @@ mod tests {
m.push_param(loc.clone());
let pinst1: Inst =
jit_ir::ParamInst::new(ParamIdx::try_from(0).unwrap(), m.int8_tyidx()).into();
m.push(pinst1.clone()).unwrap();
m.push(pinst1).unwrap();
m.push_param(loc);
let pinst2: Inst =
jit_ir::ParamInst::new(ParamIdx::try_from(1).unwrap(), m.int8_tyidx()).into();
m.push(pinst2.clone()).unwrap();
m.push(pinst2).unwrap();
let op1 = m.push_and_make_operand(pinst1).unwrap();
let op2 = m.push_and_make_operand(pinst2).unwrap();

Expand Down
Loading

0 comments on commit 01349d5

Please sign in to comment.