diff options
author | Zach Reizner <zachr@google.com> | 2018-10-03 10:22:32 -0700 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2018-10-09 21:14:05 -0700 |
commit | 55a9e504beef368bd97e51ffd5a7fa6c034eb8ad (patch) | |
tree | 894d8685e2fdfa105ea35d1cb6cfceee06502c7a /devices/src/serial.rs | |
parent | 046df60760f3b0691f23c27a7f24a96c9afe8c05 (diff) | |
download | crosvm-55a9e504beef368bd97e51ffd5a7fa6c034eb8ad.tar crosvm-55a9e504beef368bd97e51ffd5a7fa6c034eb8ad.tar.gz crosvm-55a9e504beef368bd97e51ffd5a7fa6c034eb8ad.tar.bz2 crosvm-55a9e504beef368bd97e51ffd5a7fa6c034eb8ad.tar.lz crosvm-55a9e504beef368bd97e51ffd5a7fa6c034eb8ad.tar.xz crosvm-55a9e504beef368bd97e51ffd5a7fa6c034eb8ad.tar.zst crosvm-55a9e504beef368bd97e51ffd5a7fa6c034eb8ad.zip |
cargo fmt all source code
Now that cargo fmt has landed, run it over everything at once to bring rust source to the standard formatting. TEST=cargo test BUG=None Change-Id: Ic95a48725e5a40dcbd33ba6d5aef2bd01e91865b Reviewed-on: https://chromium-review.googlesource.com/1259287 Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com> Tested-by: Zach Reizner <zachr@chromium.org> Reviewed-by: Zach Reizner <zachr@chromium.org>
Diffstat (limited to 'devices/src/serial.rs')
-rw-r--r-- | devices/src/serial.rs | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/devices/src/serial.rs b/devices/src/serial.rs index 6d7512f..39ecbe5 100644 --- a/devices/src/serial.rs +++ b/devices/src/serial.rs @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -use std::io; use std::collections::VecDeque; +use std::io; use sys_util::{EventFd, Result}; @@ -67,7 +67,7 @@ impl Serial { Serial { interrupt_enable: 0, interrupt_identification: DEFAULT_INTERRUPT_IDENTIFICATION, - interrupt_evt: interrupt_evt, + interrupt_evt, line_control: DEFAULT_LINE_CONTROL, line_status: DEFAULT_LINE_STATUS, modem_control: DEFAULT_MODEM_CONTROL, @@ -75,7 +75,7 @@ impl Serial { scratch: 0, baud_divisor: DEFAULT_BAUD_DIVISOR, in_buffer: VecDeque::new(), - out: out, + out, } } @@ -229,8 +229,8 @@ impl BusDevice for Serial { #[cfg(test)] mod tests { use super::*; - use std::sync::{Arc, Mutex}; use std::io; + use std::sync::{Arc, Mutex}; #[derive(Clone)] struct SharedBuffer { @@ -239,7 +239,9 @@ mod tests { impl SharedBuffer { fn new() -> SharedBuffer { - SharedBuffer { buf: Arc::new(Mutex::new(Vec::new())) } + SharedBuffer { + buf: Arc::new(Mutex::new(Vec::new())), + } } } @@ -262,8 +264,10 @@ mod tests { serial.write(DATA as u64, &['a' as u8]); serial.write(DATA as u64, &['b' as u8]); serial.write(DATA as u64, &['c' as u8]); - assert_eq!(serial_out.buf.lock().unwrap().as_slice(), - &['a' as u8, 'b' as u8, 'c' as u8]); + assert_eq!( + serial_out.buf.lock().unwrap().as_slice(), + &['a' as u8, 'b' as u8, 'c' as u8] + ); } #[test] @@ -271,11 +275,13 @@ mod tests { let intr_evt = EventFd::new().unwrap(); let serial_out = SharedBuffer::new(); - let mut serial = Serial::new_out(intr_evt.try_clone().unwrap(), - Box::new(serial_out.clone())); + let mut serial = + Serial::new_out(intr_evt.try_clone().unwrap(), Box::new(serial_out.clone())); serial.write(IER as u64, &[IER_RECV_BIT]); - serial.queue_input_bytes(&['a' as u8, 'b' as u8, 'c' as u8]).unwrap(); + serial + .queue_input_bytes(&['a' as u8, 'b' as u8, 'c' as u8]) + .unwrap(); assert_eq!(intr_evt.read(), Ok(1)); let mut data = [0u8; 1]; |