diff options
| author | David Tolnay <dtolnay@chromium.org> | 2019-04-12 18:22:01 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-04-17 17:22:48 -0700 |
| commit | 526d0dad9220fad4cb1fe0e9e89a16dd4f65b8de (patch) | |
| tree | cd32ff1ecea1c9fe6ecc1306584a1166a42aabed | |
| parent | 8b274875fb59a69be573607c3b29c63e80568ccd (diff) | |
| download | crosvm-526d0dad9220fad4cb1fe0e9e89a16dd4f65b8de.tar crosvm-526d0dad9220fad4cb1fe0e9e89a16dd4f65b8de.tar.gz crosvm-526d0dad9220fad4cb1fe0e9e89a16dd4f65b8de.tar.bz2 crosvm-526d0dad9220fad4cb1fe0e9e89a16dd4f65b8de.tar.lz crosvm-526d0dad9220fad4cb1fe0e9e89a16dd4f65b8de.tar.xz crosvm-526d0dad9220fad4cb1fe0e9e89a16dd4f65b8de.tar.zst crosvm-526d0dad9220fad4cb1fe0e9e89a16dd4f65b8de.zip | |
clippy: Resolve assign_op_pattern
TEST=bin/clippy Change-Id: I1cb259f399f9aff2b9b745413f9a28e130688a2b Reviewed-on: https://chromium-review.googlesource.com/1566657 Commit-Ready: David Tolnay <dtolnay@chromium.org> Tested-by: David Tolnay <dtolnay@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
| -rwxr-xr-x | bin/clippy | 1 | ||||
| -rw-r--r-- | devices/src/register_space/register_space.rs | 4 | ||||
| -rw-r--r-- | sys_util/src/mmap.rs | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/bin/clippy b/bin/clippy index 1550288..c370bd2 100755 --- a/bin/clippy +++ b/bin/clippy @@ -13,7 +13,6 @@ cd .. SUPPRESS=( # To be resolved. - assign_op_pattern block_in_if_condition_stmt clone_on_copy collapsible_if diff --git a/devices/src/register_space/register_space.rs b/devices/src/register_space/register_space.rs index 671b488..892961a 100644 --- a/devices/src/register_space/register_space.rs +++ b/devices/src/register_space/register_space.rs @@ -49,7 +49,7 @@ impl RegisterSpace { r.read(addr, data); } else { // TODO(jkwang) Add logging for debug here. - current_addr = current_addr + 1; + current_addr += 1; } } } @@ -64,7 +64,7 @@ impl RegisterSpace { current_addr = r.range().to + 1; r.write(addr, data); } else { - current_addr = current_addr + 1; + current_addr += 1; } } } diff --git a/sys_util/src/mmap.rs b/sys_util/src/mmap.rs index 8da2486..d094ba3 100644 --- a/sys_util/src/mmap.rs +++ b/sys_util/src/mmap.rs @@ -253,7 +253,7 @@ impl MemoryMapping { if (addr as usize) % pagesize() != 0 { return Err(Error::NotPageAligned); } - flags = flags | libc::MAP_FIXED; + flags |= libc::MAP_FIXED; addr as *mut libc::c_void } None => null_mut(), |