summary refs log tree commit diff
path: root/data_model
diff options
context:
space:
mode:
authorDavid Tolnay <dtolnay@chromium.org>2019-03-08 15:57:49 -0800
committerchrome-bot <chrome-bot@chromium.org>2019-03-13 21:05:03 -0700
commitfe3ef7d99892fad804cbc9de8801033fd483f337 (patch)
treeb07b227d98466d14e61660d144e85109bc632abd /data_model
parentfa132759424c5019dc9086e53d8db14500fee64f (diff)
downloadcrosvm-fe3ef7d99892fad804cbc9de8801033fd483f337.tar
crosvm-fe3ef7d99892fad804cbc9de8801033fd483f337.tar.gz
crosvm-fe3ef7d99892fad804cbc9de8801033fd483f337.tar.bz2
crosvm-fe3ef7d99892fad804cbc9de8801033fd483f337.tar.lz
crosvm-fe3ef7d99892fad804cbc9de8801033fd483f337.tar.xz
crosvm-fe3ef7d99892fad804cbc9de8801033fd483f337.tar.zst
crosvm-fe3ef7d99892fad804cbc9de8801033fd483f337.zip
edition: Update absolute paths to 2018 style
This is an easy step toward adopting 2018 edition eventually, and will
make any future CL that sets `edition = "2018"` this much smaller.

The module system changes in Rust 2018 are described here:

https://doc.rust-lang.org/edition-guide/rust-2018/module-system/path-clarity.html

Generated by running:

    cargo fix --edition --all

in each workspace, followed by bin/fmt.

TEST=cargo check
TEST=cargo check --all-features
TEST=cargo check --target aarch64-unknown-linux-gnu

Change-Id: I000ab5e69d69aa222c272fae899464bbaf65f6d8
Reviewed-on: https://chromium-review.googlesource.com/1513054
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 'data_model')
-rw-r--r--data_model/src/endian.rs2
-rw-r--r--data_model/src/lib.rs6
-rw-r--r--data_model/src/volatile_memory.rs4
3 files changed, 6 insertions, 6 deletions
diff --git a/data_model/src/endian.rs b/data_model/src/endian.rs
index 19c8d6e..014bb7b 100644
--- a/data_model/src/endian.rs
+++ b/data_model/src/endian.rs
@@ -33,7 +33,7 @@
 use assertions::const_assert;
 use std::mem::{align_of, size_of};
 
-use DataInit;
+use crate::DataInit;
 
 macro_rules! endian_type {
     ($old_type:ident, $new_type:ident, $to_new:ident, $from_new:ident) => {
diff --git a/data_model/src/lib.rs b/data_model/src/lib.rs
index a3c9284..d3f3517 100644
--- a/data_model/src/lib.rs
+++ b/data_model/src/lib.rs
@@ -117,7 +117,7 @@ macro_rules! data_init_type {
         #[cfg(test)]
         mod data_init_tests {
             use std::mem::{size_of, align_of};
-            use DataInit;
+            use crate::DataInit;
 
             #[test]
             fn from_slice_alignment() {
@@ -164,7 +164,7 @@ macro_rules! data_init_type {
 data_init_type!(u8, u16, u32, u64, usize, i8, i16, i32, i64, isize);
 
 pub mod endian;
-pub use endian::*;
+pub use crate::endian::*;
 
 pub mod volatile_memory;
-pub use volatile_memory::*;
+pub use crate::volatile_memory::*;
diff --git a/data_model/src/volatile_memory.rs b/data_model/src/volatile_memory.rs
index f7a83cd..27fe1ad 100644
--- a/data_model/src/volatile_memory.rs
+++ b/data_model/src/volatile_memory.rs
@@ -31,7 +31,7 @@ use std::result;
 use std::slice::{from_raw_parts, from_raw_parts_mut};
 use std::{isize, usize};
 
-use DataInit;
+use crate::DataInit;
 
 #[derive(Eq, PartialEq, Debug)]
 pub enum VolatileMemoryError {
@@ -58,7 +58,7 @@ impl Display for VolatileMemoryError {
 
 pub type VolatileMemoryResult<T> = result::Result<T, VolatileMemoryError>;
 
-use VolatileMemoryError as Error;
+use crate::VolatileMemoryError as Error;
 type Result<T> = VolatileMemoryResult<T>;
 
 /// Convenience function for computing `base + offset` which returns