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>

3 files changed, 27 insertions, 16 deletions

diff --git a/kvm/src/lib.rs b/kvm/src/lib.rs
index 72bea5e..32bee6c 100644
--- a/kvm/src/lib.rs
+++ b/kvm/src/lib.rs
@@ -1658,10 +1658,9 @@ mod tests {
         let mut vm = Vm::new(&kvm, gm).unwrap();
         let mem_size = 0x2000;
         let mem = MemoryMapping::new(mem_size).unwrap();
-        assert!(
-            vm.add_device_memory(GuestAddress(0x2000), mem, false, false)
-                .is_err()
-        );
+        assert!(vm
+            .add_device_memory(GuestAddress(0x2000), mem, false, false)
+            .is_err());
     }
 
     #[test]
@@ -1720,22 +1719,26 @@ mod tests {
             &evtfd,
             IoeventAddress::Pio(0xc1),
             Datamatch::U8(Some(0x7fu8)),
-        ).unwrap();
+        )
+        .unwrap();
         vm.register_ioevent(
             &evtfd,
             IoeventAddress::Pio(0xc2),
             Datamatch::U16(Some(0x1337u16)),
-        ).unwrap();
+        )
+        .unwrap();
         vm.register_ioevent(
             &evtfd,
             IoeventAddress::Pio(0xc4),
             Datamatch::U32(Some(0xdeadbeefu32)),
-        ).unwrap();
+        )
+        .unwrap();
         vm.register_ioevent(
             &evtfd,
             IoeventAddress::Pio(0xc8),
             Datamatch::U64(Some(0xdeadbeefdeadbeefu64)),
-        ).unwrap();
+        )
+        .unwrap();
     }
 
     #[test]
@@ -1752,7 +1755,8 @@ mod tests {
             &evtfd,
             IoeventAddress::Mmio(0x1004),
             Datamatch::U8(Some(0x7fu8)),
-        ).unwrap();
+        )
+        .unwrap();
         vm.unregister_ioevent(&evtfd, IoeventAddress::Pio(0xf4), Datamatch::AnyLength)
             .unwrap();
         vm.unregister_ioevent(&evtfd, IoeventAddress::Mmio(0x1000), Datamatch::AnyLength)
@@ -1761,7 +1765,8 @@ mod tests {
             &evtfd,
             IoeventAddress::Mmio(0x1004),
             Datamatch::U8(Some(0x7fu8)),
-        ).unwrap();
+        )
+        .unwrap();
     }
 
     #[test]
@@ -1821,14 +1826,16 @@ mod tests {
                 chip: KVM_IRQCHIP_IOAPIC,
                 pin: 3,
             },
-        }]).unwrap();
+        }])
+        .unwrap();
         vm.set_gsi_routing(&[IrqRoute {
             gsi: 1,
             source: IrqSource::Msi {
                 address: 0xf000000,
                 data: 0xa0,
             },
-        }]).unwrap();
+        }])
+        .unwrap();
         vm.set_gsi_routing(&[
             IrqRoute {
                 gsi: 1,
@@ -1844,7 +1851,8 @@ mod tests {
                     data: 0xa0,
                 },
             },
-        ]).unwrap();
+        ])
+        .unwrap();
     }
 
     #[test]
diff --git a/kvm/tests/dirty_log.rs b/kvm/tests/dirty_log.rs
index 269e465..645a01d 100644
--- a/kvm/tests/dirty_log.rs
+++ b/kvm/tests/dirty_log.rs
@@ -53,7 +53,8 @@ fn test_run() {
                 .expect("failed to create memory mapping"),
             false,
             true,
-        ).expect("failed to register memory");
+        )
+        .expect("failed to register memory");
 
     loop {
         match vcpu.run().expect("run failed") {
diff --git a/kvm/tests/read_only_memory.rs b/kvm/tests/read_only_memory.rs
index 4bd4778..5114ce4 100644
--- a/kvm/tests/read_only_memory.rs
+++ b/kvm/tests/read_only_memory.rs
@@ -54,7 +54,8 @@ fn test_run() {
         MemoryMapping::from_fd(&mem, mem_size as usize).expect("failed to create memory mapping"),
         false,
         false,
-    ).expect("failed to register memory");
+    )
+    .expect("failed to register memory");
 
     // Give some read only memory for the test code to read from and force a vcpu exit when it reads
     // from it.
@@ -71,7 +72,8 @@ fn test_run() {
         MemoryMapping::from_fd(&mem_ro, 0x1000).expect("failed to create memory mapping"),
         true,
         false,
-    ).expect("failed to register memory");
+    )
+    .expect("failed to register memory");
 
     // Ensure we get exactly 1 exit from attempting to write to read only memory.
     let mut exits = 0;