Rustfmt with config

src/rust/util.rs

@@ -88,7 +88,8 @@ pub fn write_leb_i32(buf: &mut Vec<u8>, mut v: i32) {
         let sign_bit = byte & (1 << 6);
         if (v == 0 && sign_bit == 0) || (v == -1 && sign_bit != 0) {
             more = false;
-        } else {
+        }
+        else {
             byte |= 0b10000000; // turn on MSB
         }
         buf.push(byte);

src/rust/wasmgen/c_api.rs

@@ -4,14 +4,10 @@ use wasmgen::module_init::get_module;
 pub use wasmgen::module_init::wg_setup;
 
 #[no_mangle]
-pub fn wg_get_code_section() -> *mut Vec<u8> {
-    &mut get_module().code_section
-}
+pub fn wg_get_code_section() -> *mut Vec<u8> { &mut get_module().code_section }
 
 #[no_mangle]
-pub fn wg_get_instruction_body() -> *mut Vec<u8> {
-    &mut get_module().instruction_body
-}
+pub fn wg_get_instruction_body() -> *mut Vec<u8> { &mut get_module().instruction_body }
 
 #[no_mangle]
 pub fn wg_reset() {

src/rust/wasmgen/module_init.rs

@@ -37,9 +37,7 @@ pub fn wg_setup() {
     get_module().init();
 }
 
-pub fn get_module<'a>() -> &'a mut WasmBuilder {
-    unsafe { MODULE_PTR.as_mut() }
-}
+pub fn get_module<'a>() -> &'a mut WasmBuilder { unsafe { MODULE_PTR.as_mut() } }
 
 pub struct WasmBuilder {
     pub output: Vec<u8>,
@@ -322,17 +320,13 @@ impl WasmBuilder {
             None => {
                 let idx = self.write_import_entry(fn_name, type_index);
                 idx
-            }
+            },
         }
     }
 
-    pub fn get_op_ptr(&self) -> *const u8 {
-        self.output.as_ptr()
-    }
+    pub fn get_op_ptr(&self) -> *const u8 { self.output.as_ptr() }
 
-    pub fn get_op_len(&self) -> usize {
-        self.output.len()
-    }
+    pub fn get_op_len(&self) -> usize { self.output.len() }
 
     pub fn commit_instruction_body_cs(&mut self) {
         self.code_section.append(&mut self.instruction_body);

src/rust/wasmgen/wasm_util.rs

@@ -49,24 +49,16 @@ pub fn wg_store_aligned_i32(buf: &mut Vec<u8>) {
 }
 
 #[no_mangle]
-pub fn wg_add_i32(buf: &mut Vec<u8>) {
-    buf.push(op::OP_I32ADD);
-}
+pub fn wg_add_i32(buf: &mut Vec<u8>) { buf.push(op::OP_I32ADD); }
 
 #[no_mangle]
-pub fn wg_and_i32(buf: &mut Vec<u8>) {
-    buf.push(op::OP_I32AND);
-}
+pub fn wg_and_i32(buf: &mut Vec<u8>) { buf.push(op::OP_I32AND); }
 
 #[no_mangle]
-pub fn wg_or_i32(buf: &mut Vec<u8>) {
-    buf.push(op::OP_I32OR);
-}
+pub fn wg_or_i32(buf: &mut Vec<u8>) { buf.push(op::OP_I32OR); }
 
 #[no_mangle]
-pub fn wg_shl_i32(buf: &mut Vec<u8>) {
-    buf.push(op::OP_I32SHL);
-}
+pub fn wg_shl_i32(buf: &mut Vec<u8>) { buf.push(op::OP_I32SHL); }
 
 #[no_mangle]
 pub fn wg_call_fn(buf: &mut Vec<u8>, fn_idx: u16) {
@@ -84,34 +76,22 @@ pub fn wg_call_fn_with_arg(buf: &mut Vec<u8>, fn_idx: u16, arg0: i32) {
 }
 
 #[no_mangle]
-pub fn wg_eq_i32(buf: &mut Vec<u8>) {
-    buf.push(op::OP_I32EQ);
-}
+pub fn wg_eq_i32(buf: &mut Vec<u8>) { buf.push(op::OP_I32EQ); }
 
 #[no_mangle]
-pub fn wg_ne_i32(buf: &mut Vec<u8>) {
-    buf.push(op::OP_I32NE);
-}
+pub fn wg_ne_i32(buf: &mut Vec<u8>) { buf.push(op::OP_I32NE); }
 
 #[no_mangle]
-pub fn wg_le_i32(buf: &mut Vec<u8>) {
-    buf.push(op::OP_I32LES);
-}
+pub fn wg_le_i32(buf: &mut Vec<u8>) { buf.push(op::OP_I32LES); }
 
 #[no_mangle]
-pub fn wg_lt_i32(buf: &mut Vec<u8>) {
-    buf.push(op::OP_I32LTS);
-}
+pub fn wg_lt_i32(buf: &mut Vec<u8>) { buf.push(op::OP_I32LTS); }
 
 #[no_mangle]
-pub fn wg_ge_i32(buf: &mut Vec<u8>) {
-    buf.push(op::OP_I32GES);
-}
+pub fn wg_ge_i32(buf: &mut Vec<u8>) { buf.push(op::OP_I32GES); }
 
 #[no_mangle]
-pub fn wg_gt_i32(buf: &mut Vec<u8>) {
-    buf.push(op::OP_I32GTS);
-}
+pub fn wg_gt_i32(buf: &mut Vec<u8>) { buf.push(op::OP_I32GTS); }
 
 #[no_mangle]
 pub fn wg_if_i32(buf: &mut Vec<u8>) {
@@ -132,9 +112,7 @@ pub fn wg_tee_local(buf: &mut Vec<u8>, idx: i32) {
 }
 
 #[no_mangle]
-pub fn wg_xor_i32(buf: &mut Vec<u8>) {
-    buf.push(op::OP_I32XOR);
-}
+pub fn wg_xor_i32(buf: &mut Vec<u8>) { buf.push(op::OP_I32XOR); }
 
 #[no_mangle]
 pub fn wg_load_unaligned_i32_from_stack(buf: &mut Vec<u8>, byte_offset: u32) {
@@ -160,19 +138,13 @@ pub fn wg_store_unaligned_i32(buf: &mut Vec<u8>, byte_offset: u32) {
 }
 
 #[no_mangle]
-pub fn wg_shr_u32(buf: &mut Vec<u8>) {
-    buf.push(op::OP_I32SHRU);
-}
+pub fn wg_shr_u32(buf: &mut Vec<u8>) { buf.push(op::OP_I32SHRU); }
 
 #[no_mangle]
-pub fn wg_shr_i32(buf: &mut Vec<u8>) {
-    buf.push(op::OP_I32SHRS);
-}
+pub fn wg_shr_i32(buf: &mut Vec<u8>) { buf.push(op::OP_I32SHRS); }
 
 #[no_mangle]
-pub fn wg_eqz_i32(buf: &mut Vec<u8>) {
-    buf.push(op::OP_I32EQZ);
-}
+pub fn wg_eqz_i32(buf: &mut Vec<u8>) { buf.push(op::OP_I32EQZ); }
 
 #[no_mangle]
 pub fn wg_if_void(buf: &mut Vec<u8>) {
@@ -181,9 +153,7 @@ pub fn wg_if_void(buf: &mut Vec<u8>) {
 }
 
 #[no_mangle]
-pub fn wg_else(buf: &mut Vec<u8>) {
-    buf.push(op::OP_ELSE);
-}
+pub fn wg_else(buf: &mut Vec<u8>) { buf.push(op::OP_ELSE); }
 
 #[no_mangle]
 pub fn wg_loop_void(buf: &mut Vec<u8>) {
@@ -198,19 +168,13 @@ pub fn wg_block_void(buf: &mut Vec<u8>) {
 }
 
 #[no_mangle]
-pub fn wg_block_end(buf: &mut Vec<u8>) {
-    buf.push(op::OP_END);
-}
+pub fn wg_block_end(buf: &mut Vec<u8>) { buf.push(op::OP_END); }
 
 #[no_mangle]
-pub fn wg_return(buf: &mut Vec<u8>) {
-    buf.push(op::OP_RETURN);
-}
+pub fn wg_return(buf: &mut Vec<u8>) { buf.push(op::OP_RETURN); }
 
 #[no_mangle]
-pub fn wg_drop(buf: &mut Vec<u8>) {
-    buf.push(op::OP_DROP);
-}
+pub fn wg_drop(buf: &mut Vec<u8>) { buf.push(op::OP_DROP); }
 
 // Generate a br_table where an input of [i] will branch [i]th outer block,
 // where [i] is passed on the wasm stack
@@ -245,14 +209,10 @@ pub fn wg_set_local(buf: &mut Vec<u8>, idx: i32) {
 }
 
 #[no_mangle]
-pub fn wg_unreachable(buf: &mut Vec<u8>) {
-    buf.push(op::OP_UNREACHABLE);
-}
+pub fn wg_unreachable(buf: &mut Vec<u8>) { buf.push(op::OP_UNREACHABLE); }
 
 #[no_mangle]
-pub fn wg_increment_mem32(buf: &mut Vec<u8>, addr: i32) {
-    wg_increment_variable(buf, addr, 1)
-}
+pub fn wg_increment_mem32(buf: &mut Vec<u8>, addr: i32) { wg_increment_variable(buf, addr, 1) }
 
 #[no_mangle]
 pub fn wg_increment_variable(buf: &mut Vec<u8>, addr: i32, n: i32) {