diff options
author | Jingkui Wang <jkwang@google.com> | 2019-03-07 12:21:39 -0800 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2019-03-08 21:20:19 -0800 |
commit | 9fc96ec8fb6bd23dbe2eff6e44ebe7549787e5d0 (patch) | |
tree | 834365dbb0e658843e0ce68108199a97e1244735 /devices/src/register_space/register.rs | |
parent | b771521aa653d2275ffff1b36c32a204fd8ad1a5 (diff) | |
download | crosvm-9fc96ec8fb6bd23dbe2eff6e44ebe7549787e5d0.tar crosvm-9fc96ec8fb6bd23dbe2eff6e44ebe7549787e5d0.tar.gz crosvm-9fc96ec8fb6bd23dbe2eff6e44ebe7549787e5d0.tar.bz2 crosvm-9fc96ec8fb6bd23dbe2eff6e44ebe7549787e5d0.tar.lz crosvm-9fc96ec8fb6bd23dbe2eff6e44ebe7549787e5d0.tar.xz crosvm-9fc96ec8fb6bd23dbe2eff6e44ebe7549787e5d0.tar.zst crosvm-9fc96ec8fb6bd23dbe2eff6e44ebe7549787e5d0.zip |
register_space: use sync::Mutex instead of std::sync::Mutex
Then we don't need to unwrap BUG=chromium:831850 TEST=cargo test CQ-DEPEND=CL:1506828 Change-Id: I4200ea6351d61df1974e5e4c8583e783b21ea0eb Reviewed-on: https://chromium-review.googlesource.com/1509514 Commit-Ready: Zach Reizner <zachr@chromium.org> Tested-by: Jingkui Wang <jkwang@google.com> Reviewed-by: Jingkui Wang <jkwang@google.com>
Diffstat (limited to 'devices/src/register_space/register.rs')
-rw-r--r-- | devices/src/register_space/register.rs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/devices/src/register_space/register.rs b/devices/src/register_space/register.rs index 3b113f9..44beaf5 100644 --- a/devices/src/register_space/register.rs +++ b/devices/src/register_space/register.rs @@ -6,7 +6,8 @@ use std; use std::boxed::Box; use std::cmp::{max, min, Ord, Ordering, PartialEq, PartialOrd}; use std::mem::size_of; -use std::sync::{Arc, Mutex, MutexGuard}; +use std::sync::{Arc, MutexGuard}; +use sync::Mutex; use data_model::DataInit; @@ -216,7 +217,7 @@ impl<T: RegisterValue> Register<T> { } fn lock(&self) -> MutexGuard<RegisterInner<T>> { - self.inner.lock().expect("fail to lock register") + self.inner.lock() } } @@ -562,16 +563,16 @@ mod tests { let s2 = state.clone(); r.set_write_cb(move |val: u8| { - *s2.lock().unwrap() = val as u8; + *s2.lock() = val as u8; val }); let data: [u8; 4] = [0, 0, 0, 0xff]; r.write_bar(0, &data); - assert_eq!(*state.lock().unwrap(), 0xf); + assert_eq!(*state.lock(), 0xf); r.set_value(0xab); - assert_eq!(*state.lock().unwrap(), 0xf); + assert_eq!(*state.lock(), 0xf); let data: [u8; 1] = [0xfc]; r.write_bar(3, &data); - assert_eq!(*state.lock().unwrap(), 0xc); + assert_eq!(*state.lock(), 0xc); } } |