fluencelabs/wasm-bindgen
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasm-bindgen synced 2025-06-15 14:01:25 +00:00
Code Issues Projects Releases Wiki Activity

Update parity-wasm dependency

Browse Source 
While doing this, make `parity-wasm` a public dependency of all crates
instead of using the `Any` trick as that's not really needed any more.
This commit is contained in:
Alex Crichton
2018-10-08 10:01:53 -07:00
parent e3e5c0f57d
commit 79e4324a3b
7 changed files with 9 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
crates/cli-support/src/lib.rs
View File

@ -8,7 +8,6 @@ extern crate wasm_bindgen_gc;
extern crate failure;
extern crate wasm_bindgen_wasm_interpreter as wasm_interpreter;
use std::any::Any;
use std::collections::BTreeSet;
use std::env;
use std::fs;
@ -40,7 +39,6 @@ pub struct Bindgen {
enum Input {
Path(PathBuf),
Bytes(Vec<u8>, String),
Module(Module, String),
None,
}
@ -68,33 +66,10 @@ impl Bindgen {
}
/// Explicitly specify the already parsed input module.
///
/// Note that this API is a little wonky to avoid tying itself with a public
/// dependency on the `parity-wasm` crate, what we currently use to parse
/// wasm mdoules.
///
/// If the `module` argument is a `parity_wasm::Module` then it will be used
/// directly. Otherwise it will be passed to `into_bytes` to serialize the
/// module to a vector of bytes, and this will deserialize the module later.
///
/// Note that even if the argument passed in is a `parity_wasm::Module` it
/// doesn't mean that this won't invoke `into_bytes`, if the `parity_wasm`
/// crate versions are different we'll have to go through serialization.
pub fn input_module<T: Any>(
&mut self,
name: &str,
mut module: T,
into_bytes: impl FnOnce(T) -> Vec<u8>,
) -> &mut Bindgen {
pub fn input_module(&mut self, name: &str, module: Module) -> &mut Bindgen {
let name = name.to_string();
if let Some(module) = (&mut module as &mut Any).downcast_mut::<Module>() {
let blank = Module::new(Vec::new());
self.input = Input::Module(mem::replace(module, blank), name);
return self;
}
self.input = Input::Bytes(into_bytes(module), name);
self
self.input = Input::Module(module, name);
return self;
}
pub fn nodejs(&mut self, node: bool) -> &mut Bindgen {
@ -153,11 +128,6 @@ impl Bindgen {
let blank_module = Module::new(Vec::new());
(mem::replace(m, blank_module), &name[..])
}
Input::Bytes(ref b, ref name) => {
let module = parity_wasm::deserialize_buffer::<Module>(&b)
.context("failed to parse input file as wasm")?;
(module, &name[..])
}
Input::Path(ref path) => {
let contents = fs::read(&path)
.with_context(|_| format!("failed to read `{}`", path.display()))?;