[core] Fix memory vec (#176)

* Fix memory vec error * Update build scripts * Add rustfmt skip * Delete empty line Co-Authored-By: Hero Bird <robbepop@web.de>
use-ink · Aug 20, 2019 · d386482 · d386482
1 parent 9c05d4c
commit d386482
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 17 deletions.
diff --git a/core/src/env/srml/srml_only/calls.rs b/core/src/env/srml/srml_only/calls.rs
@@ -14,16 +14,18 @@
 // You should have received a copy of the GNU General Public License
 // along with ink!.  If not, see <http://www.gnu.org/licenses/>.
 
+// We need this to fix a rustfmt issue. https://github.com/rust-lang/rustfmt/issues/3750
+#[rustfmt::skip]
 use crate::{
     env::{
         self,
         CallError,
         Env,
         EnvTypes,
     },
-    memory::vec::{
-        self,
-        Vec,
+    memory::{
+        vec,
+        vec::Vec,
     },
 };
 use core::marker::PhantomData;

diff --git a/examples/lang/erc20/build.sh b/examples/lang/erc20/build.sh
@@ -7,7 +7,8 @@ PROJNAME=erc20
 # cargo clean
 # rm Cargo.lock
 
-CARGO_INCREMENTAL=0 cargo +nightly build --no-default-features --release --target=wasm32-unknown-unknown --verbose
+CARGO_INCREMENTAL=0 &&
+cargo +nightly build --no-default-features --release --target=wasm32-unknown-unknown --verbose
 wasm2wat -o target/$PROJNAME.wat target/wasm32-unknown-unknown/release/$PROJNAME.wasm
 cat target/$PROJNAME.wat | sed "s/(import \"env\" \"memory\" (memory (;0;) 2))/(import \"env\" \"memory\" (memory (;0;) 2 16))/" > target/$PROJNAME-fixed.wat
 wat2wasm -o target/$PROJNAME.wasm target/$PROJNAME-fixed.wat

diff --git a/examples/lang/events/build.sh b/examples/lang/events/build.sh
@@ -5,7 +5,8 @@ PROJNAME=events
 # cargo clean
 # rm Cargo.lock
 
-CARGO_INCREMENTAL=0 cargo +nightly build --no-default-features --release --target=wasm32-unknown-unknown --verbose
+CARGO_INCREMENTAL=0 &&
+cargo +nightly build --no-default-features --release --target=wasm32-unknown-unknown --verbose
 wasm2wat -o target/$PROJNAME.wat target/wasm32-unknown-unknown/release/$PROJNAME.wasm
 cat target/$PROJNAME.wat | sed "s/(import \"env\" \"memory\" (memory (;0;) 2))/(import \"env\" \"memory\" (memory (;0;) 2 16))/" > target/$PROJNAME-fixed.wat
 wat2wasm -o target/$PROJNAME.wasm target/$PROJNAME-fixed.wat

diff --git a/examples/lang/flipper/build.sh b/examples/lang/flipper/build.sh
@@ -3,11 +3,11 @@
 set -e
 
 PROJNAME=flipper
-
 # cargo clean
 # rm Cargo.lock
 
-CARGO_INCREMENTAL=0 cargo +nightly build --no-default-features --release --target=wasm32-unknown-unknown --verbose
+CARGO_INCREMENTAL=0 &&
+cargo +nightly build --no-default-features --release --target=wasm32-unknown-unknown --verbose
 wasm2wat -o target/$PROJNAME.wat target/wasm32-unknown-unknown/release/$PROJNAME.wasm
 cat target/$PROJNAME.wat | sed "s/(import \"env\" \"memory\" (memory (;0;) 2))/(import \"env\" \"memory\" (memory (;0;) 2 16))/" > target/$PROJNAME-fixed.wat
 wat2wasm -o target/$PROJNAME.wasm target/$PROJNAME-fixed.wat

diff --git a/examples/lang/incrementer/build.sh b/examples/lang/incrementer/build.sh
@@ -1,10 +1,14 @@
 #!/bin/bash
+set -e
 
 PROJNAME=incrementer
 
+# cargo clean
+# rm Cargo.lock
+
 CARGO_INCREMENTAL=0 &&
-cargo +nightly build --release --target=wasm32-unknown-unknown --verbose &&
-wasm2wat -o target/$PROJNAME.wat target/wasm32-unknown-unknown/release/$PROJNAME.wasm &&
-cat target/$PROJNAME.wat | sed "s/(import \"env\" \"memory\" (memory (;0;) 2))/(import \"env\" \"memory\" (memory (;0;) 2 16))/" > target/$PROJNAME-fixed.wat &&
-wat2wasm -o target/$PROJNAME.wasm target/$PROJNAME-fixed.wat &&
-wasm-prune --exports call,deploy target/$PROJNAME.wasm target/$PROJNAME-pruned.wasm
+cargo +nightly build --no-default-features --release --target=wasm32-unknown-unknown --verbose
+wasm2wat -o target/$PROJNAME.wat target/wasm32-unknown-unknown/release/$PROJNAME.wasm
+cat target/$PROJNAME.wat | sed "s/(import \"env\" \"memory\" (memory (;0;) 2))/(import \"env\" \"memory\" (memory (;0;) 2 16))/" > target/$PROJNAME-fixed.wat
+wat2wasm -o target/$PROJNAME.wasm target/$PROJNAME-fixed.wat
+wasm-prune --exports call,deploy target/$PROJNAME.wasm target/$PROJNAME-pruned.wasm
diff --git a/examples/lang/shared_vec/build.sh b/examples/lang/shared_vec/build.sh
@@ -1,10 +1,12 @@
 #!/bin/bash
 
 PROJNAME=shared_vec
+# cargo clean
+# rm Cargo.lock
 
 CARGO_INCREMENTAL=0 &&
-cargo +nightly build --release --target=wasm32-unknown-unknown --verbose &&
-wasm2wat -o target/$PROJNAME.wat target/wasm32-unknown-unknown/release/$PROJNAME.wasm &&
-cat target/$PROJNAME.wat | sed "s/(import \"env\" \"memory\" (memory (;0;) 2))/(import \"env\" \"memory\" (memory (;0;) 2 16))/" > target/$PROJNAME-fixed.wat &&
-wat2wasm -o target/$PROJNAME.wasm target/$PROJNAME-fixed.wat &&
-wasm-prune --exports call,deploy target/$PROJNAME.wasm target/$PROJNAME-pruned.wasm
+cargo +nightly build --no-default-features --release --target=wasm32-unknown-unknown --verbose
+wasm2wat -o target/$PROJNAME.wat target/wasm32-unknown-unknown/release/$PROJNAME.wasm
+cat target/$PROJNAME.wat | sed "s/(import \"env\" \"memory\" (memory (;0;) 2))/(import \"env\" \"memory\" (memory (;0;) 2 16))/" > target/$PROJNAME-fixed.wat
+wat2wasm -o target/$PROJNAME.wasm target/$PROJNAME-fixed.wat
+wasm-prune --exports call,deploy target/$PROJNAME.wasm target/$PROJNAME-pruned.wasm