summary refs log tree commit diff
path: root/devices/src/bus.rs
diff options
context:
space:
mode:
authorDavid Tolnay <dtolnay@chromium.org>2018-12-12 14:33:42 -0800
committerchrome-bot <chrome-bot@chromium.org>2018-12-13 19:28:04 -0800
commit2bac1e7a9c710d6ad3e50a10463f758a1b5db40a (patch)
treefefb6ff3f38f84698b5e558f2692af15793bdde0 /devices/src/bus.rs
parent3397126b3c862fbd58c7fd31e90eb64c524d27ec (diff)
downloadcrosvm-2bac1e7a9c710d6ad3e50a10463f758a1b5db40a.tar
crosvm-2bac1e7a9c710d6ad3e50a10463f758a1b5db40a.tar.gz
crosvm-2bac1e7a9c710d6ad3e50a10463f758a1b5db40a.tar.bz2
crosvm-2bac1e7a9c710d6ad3e50a10463f758a1b5db40a.tar.lz
crosvm-2bac1e7a9c710d6ad3e50a10463f758a1b5db40a.tar.xz
crosvm-2bac1e7a9c710d6ad3e50a10463f758a1b5db40a.tar.zst
crosvm-2bac1e7a9c710d6ad3e50a10463f758a1b5db40a.zip
toolchain: Update to Rust 1.31.0
We updated the production toolchain from 1.30 to 1.31 in CL:1366446.
This CL does the same upgrade for the local developer toolchain and
Kokoro.

The relevant changes are in rust-toolchain and kokoro/Dockerfile.
The rest are from rustfmt.

TEST=cargo fmt --all -- --check
TEST=as described in kokoro/README.md

Change-Id: I3b4913f3e237baa36c664b4953be360c09efffd4
Reviewed-on: https://chromium-review.googlesource.com/1374376
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: David Tolnay <dtolnay@chromium.org>
Reviewed-by: Zach Reizner <zachr@chromium.org>
Diffstat (limited to 'devices/src/bus.rs')
-rw-r--r--devices/src/bus.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/devices/src/bus.rs b/devices/src/bus.rs
index 8bee1d0..8124d87 100644
--- a/devices/src/bus.rs
+++ b/devices/src/bus.rs
@@ -111,7 +111,8 @@ impl Bus {
                     len: 1,
                     full_addr: false,
                 },
-            ).rev()
+            )
+            .rev()
             .next()?;
         Some((*range, dev))
     }
@@ -160,7 +161,8 @@ impl Bus {
                     full_addr,
                 },
                 device,
-            ).is_some()
+            )
+            .is_some()
         {
             return Err(Error::Overlap);
         }