From 2bac1e7a9c710d6ad3e50a10463f758a1b5db40a Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Wed, 12 Dec 2018 14:33:42 -0800 Subject: 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 Tested-by: David Tolnay Reviewed-by: Zach Reizner --- src/linux.rs | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'src/linux.rs') diff --git a/src/linux.rs b/src/linux.rs index 1cb99cc..7d9fa1b 100644 --- a/src/linux.rs +++ b/src/linux.rs @@ -356,7 +356,8 @@ fn create_virtio_devs( netmask, mac_address, &mem, - ).map_err(Error::VhostNetDeviceNew)?, + ) + .map_err(Error::VhostNetDeviceNew)?, ) } else { Box::new( @@ -418,7 +419,8 @@ fn create_virtio_devs( "tmpfs", (libc::MS_NOSUID | libc::MS_NODEV | libc::MS_NOEXEC) as usize, "size=67108864", - ).unwrap(); + ) + .unwrap(); // Device nodes required for DRM. let sys_dev_char_path = Path::new("/sys/dev/char"); @@ -496,7 +498,8 @@ fn create_virtio_devs( }, wayland_device_socket, resource_bridge_wl_socket, - ).map_err(Error::WaylandDeviceNew)?, + ) + .map_err(Error::WaylandDeviceNew)?, ); let jail = if cfg.multiprocess { @@ -511,7 +514,8 @@ fn create_virtio_devs( "tmpfs", (libc::MS_NOSUID | libc::MS_NODEV | libc::MS_NOEXEC) as usize, "size=67108864", - ).unwrap(); + ) + .unwrap(); // Bind mount the wayland socket's directory into jail's root. This is necessary since // each new wayland context must open() the socket. If the wayland socket is ever @@ -738,7 +742,8 @@ fn run_vcpu( exit_evt .write(1) .expect("failed to signal vcpu exit eventfd"); - }).map_err(Error::SpawnVcpu) + }) + .map_err(Error::SpawnVcpu) } // Reads the contents of a file and converts them into a u64. @@ -797,7 +802,8 @@ pub fn run_config(cfg: Config) -> Result<()> { let linux = Arch::build_vm(components, |m, e| { create_virtio_devs(cfg, m, e, wayland_device_socket, balloon_device_socket) - }).map_err(Error::BuildingVm)?; + }) + .map_err(Error::BuildingVm)?; run_control(linux, control_sockets, balloon_host_socket, sigchld_fd) } -- cgit 1.4.1