summary refs log tree commit diff
path: root/qcow/src/refcount.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 /qcow/src/refcount.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 'qcow/src/refcount.rs')
-rw-r--r--qcow/src/refcount.rs9
1 files changed, 6 insertions, 3 deletions
diff --git a/qcow/src/refcount.rs b/qcow/src/refcount.rs
index db7d8d4..a64d218 100644
--- a/qcow/src/refcount.rs
+++ b/qcow/src/refcount.rs
@@ -101,7 +101,8 @@ impl RefCount {
                 self.refblock_cache
                     .insert(table_index, table, |index, evicted| {
                         raw_file.write_refcount_block(ref_table[index], evicted.get_values())
-                    }).map_err(Error::EvictingRefCounts)?;
+                    })
+                    .map_err(Error::EvictingRefCounts)?;
             } else {
                 if block_addr_disk == 0 {
                     return Err(Error::NeedNewCluster);
@@ -181,7 +182,8 @@ impl RefCount {
             self.refblock_cache
                 .insert(table_index, table, |index, evicted| {
                     raw_file.write_refcount_block(ref_table[index], evicted.get_values())
-                }).map_err(Error::EvictingRefCounts)?;
+                })
+                .map_err(Error::EvictingRefCounts)?;
         }
         Ok(self.refblock_cache.get(&table_index).unwrap()[block_index])
     }
@@ -212,7 +214,8 @@ impl RefCount {
             self.refblock_cache
                 .insert(table_index, table, |index, evicted| {
                     raw_file.write_refcount_block(ref_table[index], evicted.get_values())
-                }).map_err(Error::EvictingRefCounts)?;
+                })
+                .map_err(Error::EvictingRefCounts)?;
         }
         // The index must exist as it was just inserted if it didn't already.
         Ok(Some(