diff options
| author | David Tolnay <dtolnay@chromium.org> | 2019-03-08 15:57:49 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-03-13 21:05:03 -0700 |
| commit | fe3ef7d99892fad804cbc9de8801033fd483f337 (patch) | |
| tree | b07b227d98466d14e61660d144e85109bc632abd /p9 | |
| parent | fa132759424c5019dc9086e53d8db14500fee64f (diff) | |
| download | crosvm-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 'p9')
| -rw-r--r-- | p9/src/lib.rs | 2 | ||||
| -rw-r--r-- | p9/src/protocol/messages.rs | 2 | ||||
| -rw-r--r-- | p9/src/server.rs | 2 | ||||
| -rw-r--r-- | p9/wire_format_derive/wire_format_derive.rs | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/p9/src/lib.rs b/p9/src/lib.rs index ef0744e..9bd8c05 100644 --- a/p9/src/lib.rs +++ b/p9/src/lib.rs @@ -10,4 +10,4 @@ extern crate wire_format_derive; mod protocol; mod server; -pub use server::Server; +pub use crate::server::Server; diff --git a/p9/src/protocol/messages.rs b/p9/src/protocol/messages.rs index b10312b..b5a03c0 100644 --- a/p9/src/protocol/messages.rs +++ b/p9/src/protocol/messages.rs @@ -7,7 +7,7 @@ use std::mem; use std::string::String; use std::vec::Vec; -use protocol::wire_format::{Data, WireFormat}; +use crate::protocol::wire_format::{Data, WireFormat}; // Message type constants. Taken from "include/net/9p/9p.h" in the linux kernel // tree. The protocol specifies each R* message to be the corresponding T* diff --git a/p9/src/server.rs b/p9/src/server.rs index 4b47956..d292cca 100644 --- a/p9/src/server.rs +++ b/p9/src/server.rs @@ -15,7 +15,7 @@ use std::os::unix::fs::{DirBuilderExt, FileExt, OpenOptionsExt}; use std::os::unix::io::AsRawFd; use std::path::{Component, Path, PathBuf}; -use protocol::*; +use crate::protocol::*; // Tlopen and Tlcreate flags. Taken from "include/net/9p/9p.h" in the linux tree. const _P9_RDONLY: u32 = 0o00000000; diff --git a/p9/wire_format_derive/wire_format_derive.rs b/p9/wire_format_derive/wire_format_derive.rs index 290ffc5..802b19b 100644 --- a/p9/wire_format_derive/wire_format_derive.rs +++ b/p9/wire_format_derive/wire_format_derive.rs @@ -51,7 +51,7 @@ fn p9_wire_format_inner(input: DeriveInput) -> TokenStream { use super::#container; - use protocol::WireFormat; + use crate::protocol::WireFormat; impl WireFormat for #container { fn byte_size(&self) -> u32 { @@ -249,7 +249,7 @@ mod tests { use super::Niijima_先輩; - use protocol::WireFormat; + use crate::protocol::WireFormat; impl WireFormat for Niijima_先輩 { fn byte_size(&self) -> u32 { |