From b0f43bb57547b16dea08872d50ac38b6a5400f4a Mon Sep 17 00:00:00 2001 From: NikVolf Date: Tue, 13 Mar 2018 15:58:18 +0300 Subject: [PATCH] rename crate --- Cargo.toml | 2 +- build/main.rs | 14 +++++++------- ext/main.rs | 6 +++--- gas/main.rs | 6 +++--- prune/main.rs | 6 +++--- stack_height/main.rs | 6 +++--- tests/diff.rs | 4 ++-- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 6303c0d..c5e78a0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "wasm-utils" +name = "pwasm-utils" version = "0.1.0" authors = ["NikVolf "] diff --git a/build/main.rs b/build/main.rs index 2b8d37a..2d8eba6 100644 --- a/build/main.rs +++ b/build/main.rs @@ -1,7 +1,7 @@ //! Experimental build tool for cargo extern crate glob; -extern crate wasm_utils; +extern crate pwasm_utils as utils; extern crate clap; extern crate parity_wasm; @@ -14,7 +14,7 @@ use std::path::PathBuf; use clap::{App, Arg}; use parity_wasm::elements; -use wasm_utils::{CREATE_SYMBOL, CALL_SYMBOL, ununderscore_funcs, externalize_mem, shrink_unknown_stack}; +use utils::{CREATE_SYMBOL, CALL_SYMBOL, ununderscore_funcs, externalize_mem, shrink_unknown_stack}; #[derive(Debug)] pub enum Error { @@ -64,7 +64,7 @@ fn has_ctor(module: &elements::Module) -> bool { } fn main() { - wasm_utils::init_log(); + utils::init_log(); let matches = App::new("wasm-build") .arg(Arg::with_name("target") @@ -151,13 +151,13 @@ fn main() { } let runtime_version: u32 = matches.value_of("runtime_version").unwrap_or("1").parse() .expect("--runtime-version should be a positive integer"); - module = wasm_utils::inject_runtime_type(module, &runtime_type, runtime_version); + module = utils::inject_runtime_type(module, &runtime_type, runtime_version); } let mut ctor_module = module.clone(); if !matches.is_present("skip_optimization") { - wasm_utils::optimize( + utils::optimize( &mut module, vec![CALL_SYMBOL] ).expect("Optimizer to finish without errors"); @@ -175,9 +175,9 @@ fn main() { // Otherwise it will just save an optimised raw_module if has_ctor(&ctor_module) { if !matches.is_present("skip_optimization") { - wasm_utils::optimize(&mut ctor_module, vec![CREATE_SYMBOL]).expect("Optimizer to finish without errors"); + utils::optimize(&mut ctor_module, vec![CREATE_SYMBOL]).expect("Optimizer to finish without errors"); } - let ctor_module = wasm_utils::pack_instance(raw_module, ctor_module).expect("Packing failed"); + let ctor_module = utils::pack_instance(raw_module, ctor_module).expect("Packing failed"); parity_wasm::serialize_to_file(&path, ctor_module).expect("Failed to serialize to file"); } else { let mut file = fs::File::create(&path).expect("Failed to create file"); diff --git a/ext/main.rs b/ext/main.rs index 6904d24..ee6796a 100644 --- a/ext/main.rs +++ b/ext/main.rs @@ -1,11 +1,11 @@ extern crate parity_wasm; -extern crate wasm_utils; +extern crate pwasm_utils as utils; use std::env; fn main() { - wasm_utils::init_log(); + utils::init_log(); let args = env::args().collect::>(); if args.len() != 3 { @@ -13,7 +13,7 @@ fn main() { return; } - let module = wasm_utils::externalize( + let module = utils::externalize( parity_wasm::deserialize_file(&args[1]).expect("Module to deserialize ok"), vec!["_free", "_malloc", "_memcpy", "_memset", "_memmove"], ); diff --git a/gas/main.rs b/gas/main.rs index c125143..4c02bce 100644 --- a/gas/main.rs +++ b/gas/main.rs @@ -1,11 +1,11 @@ extern crate parity_wasm; -extern crate wasm_utils; +extern crate pwasm_utils as utils; use std::env; fn main() { - wasm_utils::init_log(); + utils::init_log(); let args = env::args().collect::>(); if args.len() != 3 { @@ -16,7 +16,7 @@ fn main() { // Loading module let module = parity_wasm::deserialize_file(&args[1]).expect("Module deserialization to succeed"); - let result = wasm_utils::inject_gas_counter( + let result = utils::inject_gas_counter( module, &Default::default() ).expect("Failed to inject gas. Some forbidden opcodes?"); diff --git a/prune/main.rs b/prune/main.rs index 6175ad9..16f3b3c 100644 --- a/prune/main.rs +++ b/prune/main.rs @@ -1,11 +1,11 @@ extern crate parity_wasm; -extern crate wasm_utils; +extern crate pwasm_utils as utils; extern crate clap; use clap::{App, Arg}; fn main() { - wasm_utils::init_log(); + utils::init_log(); let matches = App::new("wasm-opt") .arg(Arg::with_name("input") @@ -38,7 +38,7 @@ fn main() { // Invoke optimizer // Contract is supposed to have only these functions as public api // All other symbols not usable by this list is optimized away - wasm_utils::optimize(&mut module, exports).expect("Optimizer to finish without errors"); + utils::optimize(&mut module, exports).expect("Optimizer to finish without errors"); parity_wasm::serialize_to_file(&output, module).unwrap(); } diff --git a/stack_height/main.rs b/stack_height/main.rs index f65028c..80b8122 100644 --- a/stack_height/main.rs +++ b/stack_height/main.rs @@ -1,11 +1,11 @@ -extern crate wasm_utils; +extern crate pwasm_utils as utils; extern crate parity_wasm; use std::env; -use wasm_utils::stack_height; +use utils::stack_height; fn main() { - wasm_utils::init_log(); + utils::init_log(); let args = env::args().collect::>(); if args.len() != 3 { diff --git a/tests/diff.rs b/tests/diff.rs index 1ad3d43..4dc343a 100644 --- a/tests/diff.rs +++ b/tests/diff.rs @@ -1,5 +1,5 @@ extern crate diff; -extern crate wasm_utils; +extern crate pwasm_utils as utils; extern crate wabt; extern crate parity_wasm; @@ -80,7 +80,7 @@ macro_rules! def_stack_height_test { fn $name() { run_diff_test("stack-height", concat!(stringify!($name), ".wat"), |input| { let module = elements::deserialize_buffer(input).expect("Failed to deserialize"); - let instrumented = wasm_utils::stack_height::inject_limiter(module, 1024).expect("Failed to instrument with stack counter"); + let instrumented = utils::stack_height::inject_limiter(module, 1024).expect("Failed to instrument with stack counter"); elements::serialize(instrumented).expect("Failed to serialize") }); }