diff options
author | David Tolnay <dtolnay@chromium.org> | 2018-12-12 14:33:42 -0800 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2018-12-13 19:28:04 -0800 |
commit | 2bac1e7a9c710d6ad3e50a10463f758a1b5db40a (patch) | |
tree | fefb6ff3f38f84698b5e558f2692af15793bdde0 /aarch64 | |
parent | 3397126b3c862fbd58c7fd31e90eb64c524d27ec (diff) | |
download | crosvm-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 'aarch64')
-rw-r--r-- | aarch64/src/lib.rs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/aarch64/src/lib.rs b/aarch64/src/lib.rs index 7c15ef1..c1696e4 100644 --- a/aarch64/src/lib.rs +++ b/aarch64/src/lib.rs @@ -193,8 +193,10 @@ pub struct AArch64; impl arch::LinuxArch for AArch64 { fn build_vm<F>(mut components: VmComponents, virtio_devs: F) -> Result<RunnableLinuxVm> where - F: FnOnce(&GuestMemory, &EventFd) - -> Result<Vec<(Box<PciDevice + 'static>, Option<Minijail>)>>, + F: FnOnce( + &GuestMemory, + &EventFd, + ) -> Result<Vec<(Box<PciDevice + 'static>, Option<Minijail>)>>, { let mut resources = Self::get_resource_allocator(components.memory_mb, components.wayland_dmabuf); @@ -241,7 +243,8 @@ impl arch::LinuxArch for AArch64 { AARCH64_PCI_CFG_BASE, AARCH64_PCI_CFG_SIZE, false, - ).map_err(Error::RegisterPci)?; + ) + .map_err(Error::RegisterPci)?; for param in components.extra_kernel_params { cmdline.insert_str(¶m).map_err(Error::Cmdline)?; @@ -360,7 +363,8 @@ impl AArch64 { AARCH64_SERIAL_ADDR, AARCH64_SERIAL_SIZE, false, - ).expect("failed to add serial device"); + ) + .expect("failed to add serial device"); let rtc = Arc::new(Mutex::new(devices::pl030::Pl030::new(rtc_evt))); bus.insert(rtc, AARCH64_RTC_ADDR, AARCH64_RTC_SIZE, false) |