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

Simplify using map_err and expect.

Browse Source
This commit is contained in:
Dan Gohman
2017-09-12 12:51:34 -07:00
parent ddf967962f
commit c7b1bb5f9e
3 changed files with 40 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/wasm/src/sections_translator.rs
View File

@@ -39,19 +39,15 @@ pub fn parse_function_signatures(
}) => {
let mut sig = Signature::new(CallConv::Native);
sig.argument_types.extend(params.iter().map(|ty| {
let cret_arg: cretonne::ir::Type = match type_to_type(ty) {
Ok(ty) => ty,
Err(()) => panic!("only numeric types are supported in\
function signatures"),
};
let cret_arg: cretonne::ir::Type = type_to_type(ty).expect(
"only numeric types are supported in function signatures",
);
ArgumentType::new(cret_arg)
}));
sig.return_types.extend(returns.iter().map(|ty| {
let cret_arg: cretonne::ir::Type = match type_to_type(ty) {
Ok(ty) => ty,
Err(()) => panic!("only numeric types are supported in\
function signatures"),
};
let cret_arg: cretonne::ir::Type = type_to_type(ty).expect(
"only numeric types are supported in function signatures",
);
ArgumentType::new(cret_arg)
}));
runtime.declare_signature(&sig);

28
lib/wasm/tests/testsuite.rs
View File

@@ -67,12 +67,7 @@ fn handle_module(path: PathBuf, isa: Option<&TargetIsa>) {
}
Some(ext) => {
match ext.to_str() {
Some("wasm") => {
match read_wasm_file(path.clone()) {
Ok(data) => data,
Err(err) => panic!("error reading wasm file: {}", err.description()),
}
}
Some("wasm") => read_wasm_file(path.clone()).expect("error reading wasm file"),
Some("wat") => {
let tmp_dir = TempDir::new("cretonne-wasm").unwrap();
let file_path = tmp_dir.path().join("module.wasm");
@@ -104,12 +99,7 @@ fn handle_module(path: PathBuf, isa: Option<&TargetIsa>) {
}
}
}
match read_wasm_file(file_path) {
Ok(data) => data,
Err(err) => {
panic!("error reading converted wasm file: {}", err.description());
}
}
read_wasm_file(file_path).expect("error reading converted wasm file")
}
None | Some(&_) => panic!("the file extension is not wasm or wat"),
}
@@ -121,18 +111,12 @@ fn handle_module(path: PathBuf, isa: Option<&TargetIsa>) {
};
let translation = {
let runtime: &mut WasmRuntime = &mut dummy_runtime;
match translate_module(&data, runtime) {
Ok(x) => x,
Err(string) => {
panic!(string);
}
}
translate_module(&data, runtime).unwrap()
};
for func in &translation.functions {
match verifier::verify_function(func, isa) {
Ok(()) => (),
Err(err) => panic!(pretty_verifier_error(func, isa, err)),
}
verifier::verify_function(func, isa)
.map_err(|err| panic!(pretty_verifier_error(func, isa, err)))
.unwrap();
}
}