fluencelabs/marine
1
0
Fork 0
mirror of https://github.com/fluencelabs/marine.git synced 2025-06-26 13:11:40 +00:00
Code Issues Projects Releases Wiki Activity

wit refactoring

Browse Source
This commit is contained in:
vms
2020-07-09 15:55:58 +03:00
parent d524eebc55
commit 9a02ffc54f
26 changed files with 497 additions and 483 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
crates/wit-parser/src/embedder.rs
View File

@ -26,23 +26,20 @@ use wasmer_wit::{
use std::path::PathBuf;
/// Embed provided WIT to a Wasm file by path.
pub fn embed_text_wit(
in_wasm_path: PathBuf,
out_wasm_path: PathBuf,
wit: &str,
) -> Result<(), WITParserError> {
let mut module = ModuleConfig::new()
let module = ModuleConfig::new()
.parse_file(&in_wasm_path)
.map_err(WITParserError::CorruptedWasmFile)?;
let buffer = Buffer::new(wit)?;
let ast = parse(&buffer)?;
let mut bytes = vec![];
ast.to_bytes(&mut bytes)?;
let custom = WITCustom(bytes);
module.customs.add(custom);
let mut module = embed_wit(module, &ast);
module
.emit_wasm_file(&out_wasm_path)
.map_err(WITParserError::WasmEmitError)?;
@ -50,23 +47,14 @@ pub fn embed_text_wit(
Ok(())
}
pub fn embed_wit(
in_wasm_path: PathBuf,
out_wasm_path: PathBuf,
interfaces: &Interfaces<'_>,
) -> Result<(), WITParserError> {
let mut module = ModuleConfig::new()
.parse_file(&in_wasm_path)
.map_err(WITParserError::CorruptedWasmFile)?;
/// Embed provided WIT to a Wasm module.
pub fn embed_wit(mut wasm_module: walrus::Module, interfaces: &Interfaces<'_>) -> walrus::Module {
let mut bytes = vec![];
interfaces.to_bytes(&mut bytes)?;
// TODO: think about possible errors here
interfaces.to_bytes(&mut bytes).unwrap();
let custom = WITCustom(bytes);
module.customs.add(custom);
module
.emit_wasm_file(&out_wasm_path)
.map_err(WITParserError::WasmEmitError)?;
wasm_module.customs.add(custom);
Ok(())
wasm_module
}