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

Merge pull request #3472 from fitzgen/no-expect-format

Browse Source 
Remove some uses of `foo.expect(&format!(...))` anti-pattern
This commit is contained in:
Nick Fitzgerald
2021-10-25 19:31:13 -07:00
committed by GitHub
parent 06a93d3346 e3a423c3e8
commit 82aad556ea
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
benches/instantiation.rs
View File

@@ -43,7 +43,7 @@ fn bench_sequential(c: &mut Criterion, modules: &[&str]) {
let engine = Engine::new(&config).expect("failed to create engine"); let engine = Engine::new(&config).expect("failed to create engine");
let module = Module::from_file(&engine, &path) let module = Module::from_file(&engine, &path)
.expect(&format!("failed to load benchmark `{}`", path.display())); .unwrap_or_else(|_| panic!("failed to load benchmark `{}`", path.display()));
let mut linker = Linker::new(&engine); let mut linker = Linker::new(&engine);
wasmtime_wasi::add_to_linker(&mut linker, |cx| cx).unwrap(); wasmtime_wasi::add_to_linker(&mut linker, |cx| cx).unwrap();

2
cranelift/codegen/src/isa/x64/abi.rs
View File

@@ -349,7 +349,7 @@ impl ABIMachineSpec for X64ABIMachineSpec {
to_bits: u8, to_bits: u8,
) -> Self::I { ) -> Self::I {
let ext_mode = ExtMode::new(from_bits as u16, to_bits as u16) let ext_mode = ExtMode::new(from_bits as u16, to_bits as u16)
.expect(&format!("invalid extension: {} -> {}", from_bits, to_bits)); .unwrap_or_else(|| panic!("invalid extension: {} -> {}", from_bits, to_bits));
if is_signed { if is_signed {
Inst::movsx_rm_r(ext_mode, RegMem::reg(from_reg), to_reg) Inst::movsx_rm_r(ext_mode, RegMem::reg(from_reg), to_reg)
} else { } else {

14
cranelift/codegen/src/isa/x64/lower.rs
View File

@@ -236,7 +236,7 @@ fn extend_input_to_reg<C: LowerCtx<I = Inst>>(
let ext_mode = match (input_size, requested_size) { let ext_mode = match (input_size, requested_size) {
(a, b) if a == b => return put_input_in_reg(ctx, spec), (a, b) if a == b => return put_input_in_reg(ctx, spec),
(1, 8) => return put_input_in_reg(ctx, spec), (1, 8) => return put_input_in_reg(ctx, spec),
(a, b) => ExtMode::new(a, b).expect(&format!("invalid extension: {} -> {}", a, b)), (a, b) => ExtMode::new(a, b).unwrap_or_else(|| panic!("invalid extension: {} -> {}", a, b)),
}; };
let src = input_to_reg_mem(ctx, spec); let src = input_to_reg_mem(ctx, spec);
@@ -5847,11 +5847,13 @@ fn lower_insn_to_regs<C: LowerCtx<I = Inst>>(
if ty_access == types::I64 { if ty_access == types::I64 {
ctx.emit(Inst::mov64_rm_r(rm, data)); ctx.emit(Inst::mov64_rm_r(rm, data));
} else { } else {
let ext_mode = ExtMode::new(ty_access.bits(), 64).expect(&format!( let ext_mode = ExtMode::new(ty_access.bits(), 64).unwrap_or_else(|| {
"invalid extension during AtomicLoad: {} -> {}", panic!(
ty_access.bits(), "invalid extension during AtomicLoad: {} -> {}",
64 ty_access.bits(),
)); 64
)
});
ctx.emit(Inst::movzx_rm_r(ext_mode, rm, data)); ctx.emit(Inst::movzx_rm_r(ext_mode, rm, data));
} }
} }