From d52ba8849aec689eb0d53f35e029b119baac6909 Mon Sep 17 00:00:00 2001 From: Sergei Pepyakin Date: Wed, 2 Jan 2019 23:50:38 +0100 Subject: [PATCH] Run rustfmt check on CI (#154) * Run rustfmt check on CI * Reformat. --- .travis.yml | 2 ++ src/memory.rs | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index d038692..29a7095 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,9 @@ env: install: - if [ "$TRAVIS_RUST_VERSION" == "nightly" ]; then rustup target add wasm32-unknown-unknown; fi +- rustup component add rustfmt script: +- cargo fmt --all -- --check # Make sure nightly targets are not broken. - if [ "$TRAVIS_RUST_VERSION" == "nightly" ]; then cargo check --tests --manifest-path=fuzz/Cargo.toml; fi - if [ "$TRAVIS_RUST_VERSION" == "nightly" ]; then cargo check --benches --manifest-path=benches/Cargo.toml; fi diff --git a/src/memory.rs b/src/memory.rs index f87dd50..63c60b9 100644 --- a/src/memory.rs +++ b/src/memory.rs @@ -184,7 +184,7 @@ impl MemoryInstance { } /// Returns current used memory size in bytes. - /// This is the highest memory address that had been written to. + /// This is the highest memory address that had been written to. pub fn used_size(&self) -> Bytes { Bytes(self.buffer.borrow().len()) } @@ -392,9 +392,9 @@ impl MemoryInstance { let (read_region, write_region) = self.checked_region_pair(&mut buffer, src_offset, len, dst_offset, len)?; - if dst_offset < self.lowest_used.get() as usize { - self.lowest_used.set(dst_offset as u32); - } + if dst_offset < self.lowest_used.get() as usize { + self.lowest_used.set(dst_offset as u32); + } unsafe { ::core::ptr::copy( @@ -435,9 +435,9 @@ impl MemoryInstance { ))); } - if dst_offset < self.lowest_used.get() as usize { - self.lowest_used.set(dst_offset as u32); - } + if dst_offset < self.lowest_used.get() as usize { + self.lowest_used.set(dst_offset as u32); + } unsafe { ::core::ptr::copy_nonoverlapping( @@ -478,9 +478,9 @@ impl MemoryInstance { .checked_region(&mut dst_buffer, dst_offset, len)? .range(); - if dst_offset < dst.lowest_used.get() as usize { - dst.lowest_used.set(dst_offset as u32); - } + if dst_offset < dst.lowest_used.get() as usize { + dst.lowest_used.set(dst_offset as u32); + } dst_buffer[dst_range].copy_from_slice(&src_buffer[src_range]); @@ -499,9 +499,9 @@ impl MemoryInstance { let range = self.checked_region(&mut buffer, offset, len)?.range(); - if offset < self.lowest_used.get() as usize { - self.lowest_used.set(offset as u32); - } + if offset < self.lowest_used.get() as usize { + self.lowest_used.set(offset as u32); + } for val in &mut buffer[range] { *val = new_val