diff options
author | David Tolnay <dtolnay@chromium.org> | 2019-04-08 23:00:57 -0700 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2019-04-09 22:08:37 -0700 |
commit | 902e7c8450978ddf800b5a311f570aa982ff2ba4 (patch) | |
tree | d0f7747376100a57e6d2b3258af5a9e82c84fb19 /devices/src/register_space | |
parent | 107edb3eec98a707118ae9a4a804a256e53892a0 (diff) | |
download | crosvm-902e7c8450978ddf800b5a311f570aa982ff2ba4.tar crosvm-902e7c8450978ddf800b5a311f570aa982ff2ba4.tar.gz crosvm-902e7c8450978ddf800b5a311f570aa982ff2ba4.tar.bz2 crosvm-902e7c8450978ddf800b5a311f570aa982ff2ba4.tar.lz crosvm-902e7c8450978ddf800b5a311f570aa982ff2ba4.tar.xz crosvm-902e7c8450978ddf800b5a311f570aa982ff2ba4.tar.zst crosvm-902e7c8450978ddf800b5a311f570aa982ff2ba4.zip |
edition: Use 2018-style paths in devices crate
These are import paths in new code added since CL:1513054 that need to be made compatible with 2018 edition's treatment of paths. TEST=cargo check TEST=cargo check --all-features TEST=cargo check --target aarch64-unknown-linux-gnu Change-Id: Icb3ecf2fb2015332e0c03cdc22bff2ecab2c40df Reviewed-on: https://chromium-review.googlesource.com/1559264 Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com> Tested-by: David Tolnay <dtolnay@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: David Tolnay <dtolnay@chromium.org>
Diffstat (limited to 'devices/src/register_space')
-rw-r--r-- | devices/src/register_space/register.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/devices/src/register_space/register.rs b/devices/src/register_space/register.rs index 19e5267..4325344 100644 --- a/devices/src/register_space/register.rs +++ b/devices/src/register_space/register.rs @@ -172,7 +172,7 @@ where #[macro_export] macro_rules! static_register { (ty: $ty:ty,offset: $offset:expr,value: $value:expr,) => {{ - use register_space::*; + use crate::register_space::*; static REG_SPEC: StaticRegisterSpec<$ty> = StaticRegisterSpec::<$ty> { offset: $offset, value: $value, @@ -356,7 +356,7 @@ macro_rules! register { guest_writeable_mask: $mask:expr, guest_write_1_to_clear_mask: $w1tcm:expr, ) => {{ - use register_space::*; + use crate::register_space::*; let spec: RegisterSpec<$ty> = RegisterSpec::<$ty> { name: String::from($name), offset: $offset, @@ -367,7 +367,7 @@ macro_rules! register { Register::<$ty>::new(spec, $rv) }}; (name: $name:tt, ty: $ty:ty,offset: $offset:expr,reset_value: $rv:expr,) => {{ - use register_space::*; + use crate::register_space::*; let spec: RegisterSpec<$ty> = RegisterSpec::<$ty> { name: String::from($name), offset: $offset, @@ -392,11 +392,11 @@ macro_rules! register_array { $gwm:expr,guest_write_1_to_clear_mask: $gw1tcm:expr, ) => {{ - use register_space::*; + use crate::register_space::*; let mut v: Vec<Register<$ty>> = Vec::new(); for i in 0..$cnt { let offset = $base_offset + ($stride * i) as RegisterOffset; - let mut spec: RegisterSpec<$ty> = RegisterSpec::<$ty> { + let spec: RegisterSpec<$ty> = RegisterSpec::<$ty> { name: format!("{}-{}", $name, i), offset, reset_value: $rv, |