summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaniel Verkamp <dverkamp@chromium.org>2019-11-07 11:22:35 -0800
committerCommit Bot <commit-bot@chromium.org>2019-11-08 02:16:53 +0000
commit18655cc1247c31717b2bd2cfdf114f0acb93a610 (patch)
treea3a3154c04ccca4c7b0ed767f74be74e7e72bab5
parent07e3c4184b928176b01f1d8222d905ca1d9fe0d0 (diff)
downloadcrosvm-18655cc1247c31717b2bd2cfdf114f0acb93a610.tar
crosvm-18655cc1247c31717b2bd2cfdf114f0acb93a610.tar.gz
crosvm-18655cc1247c31717b2bd2cfdf114f0acb93a610.tar.bz2
crosvm-18655cc1247c31717b2bd2cfdf114f0acb93a610.tar.lz
crosvm-18655cc1247c31717b2bd2cfdf114f0acb93a610.tar.xz
crosvm-18655cc1247c31717b2bd2cfdf114f0acb93a610.tar.zst
crosvm-18655cc1247c31717b2bd2cfdf114f0acb93a610.zip
Remove duplicated semicolons
This will be checked by Rust 1.39.0's rustfmt.

BUG=None
TEST=bin/fmt --check

Change-Id: I8f037207af39f7de1c346365259a10dbe044450b
Signed-off-by: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1904162
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Zach Reizner <zachr@chromium.org>
-rw-r--r--devices/src/usb/xhci/scatter_gather_buffer.rs6
-rw-r--r--devices/src/virtio/descriptor_utils.rs10
2 files changed, 8 insertions, 8 deletions
diff --git a/devices/src/usb/xhci/scatter_gather_buffer.rs b/devices/src/usb/xhci/scatter_gather_buffer.rs
index 0150e4f..4974bc1 100644
--- a/devices/src/usb/xhci/scatter_gather_buffer.rs
+++ b/devices/src/usb/xhci/scatter_gather_buffer.rs
@@ -166,11 +166,11 @@ mod test {
 
         let mut d = [0; 4];
         gm.read_exact_at_addr(&mut d, GuestAddress(0x100)).unwrap();
-        assert_eq!(d, [7, 6, 5, 4]);;
+        assert_eq!(d, [7, 6, 5, 4]);
         gm.read_exact_at_addr(&mut d, GuestAddress(0x200)).unwrap();
-        assert_eq!(d, [3, 2, 0, 0]);;
+        assert_eq!(d, [3, 2, 0, 0]);
         gm.read_exact_at_addr(&mut d, GuestAddress(0x300)).unwrap();
-        assert_eq!(d, [1, 0, 0, 0]);;
+        assert_eq!(d, [1, 0, 0, 0]);
 
         let mut data_read = [0; 7];
         buffer.read(&mut data_read).unwrap();
diff --git a/devices/src/virtio/descriptor_utils.rs b/devices/src/virtio/descriptor_utils.rs
index 00c52c9..c726034 100644
--- a/devices/src/virtio/descriptor_utils.rs
+++ b/devices/src/virtio/descriptor_utils.rs
@@ -648,7 +648,7 @@ mod tests {
             ],
             0,
         )
-        .expect("create_descriptor_chain failed");;
+        .expect("create_descriptor_chain failed");
         let mut writer = Writer::new(&memory, chain).expect("failed to create Writer");
         assert_eq!(writer.available_bytes(), 106);
         assert_eq!(writer.bytes_written(), 0);
@@ -684,7 +684,7 @@ mod tests {
             vec![(Writable, 8)],
             0,
         )
-        .expect("create_descriptor_chain failed");;
+        .expect("create_descriptor_chain failed");
         let mut reader = Reader::new(&memory, chain).expect("failed to create Reader");
         assert_eq!(reader.available_bytes(), 0);
         assert_eq!(reader.bytes_read(), 0);
@@ -709,7 +709,7 @@ mod tests {
             vec![(Readable, 8)],
             0,
         )
-        .expect("create_descriptor_chain failed");;
+        .expect("create_descriptor_chain failed");
         let mut writer = Writer::new(&memory, chain).expect("failed to create Writer");
         assert_eq!(writer.available_bytes(), 0);
         assert_eq!(writer.bytes_written(), 0);
@@ -734,7 +734,7 @@ mod tests {
             vec![(Readable, 256), (Readable, 256)],
             0,
         )
-        .expect("create_descriptor_chain failed");;
+        .expect("create_descriptor_chain failed");
 
         let mut reader = Reader::new(&memory, chain).expect("failed to create Reader");
 
@@ -926,7 +926,7 @@ mod tests {
             ],
             0,
         )
-        .expect("create_descriptor_chain failed");;
+        .expect("create_descriptor_chain failed");
         let mut reader = Reader::new(&memory, chain).expect("failed to create Reader");
 
         let other = reader.split_at(32).expect("failed to split Reader");