summary refs log tree commit diff
path: root/msg_socket
diff options
context:
space:
mode:
authorDavid Tolnay <dtolnay@chromium.org>2019-04-12 12:18:35 -0700
committerchrome-bot <chrome-bot@chromium.org>2019-04-15 02:06:07 -0700
commit633426a8fc20a5eef402e159d53228aae13bbaa5 (patch)
treeddc7e53a2baeebd3fdd15d724107e7f018de4dc4 /msg_socket
parent62041f041956a2ccfdd0a340b65b8a2cb0749655 (diff)
downloadcrosvm-633426a8fc20a5eef402e159d53228aae13bbaa5.tar
crosvm-633426a8fc20a5eef402e159d53228aae13bbaa5.tar.gz
crosvm-633426a8fc20a5eef402e159d53228aae13bbaa5.tar.bz2
crosvm-633426a8fc20a5eef402e159d53228aae13bbaa5.tar.lz
crosvm-633426a8fc20a5eef402e159d53228aae13bbaa5.tar.xz
crosvm-633426a8fc20a5eef402e159d53228aae13bbaa5.tar.zst
crosvm-633426a8fc20a5eef402e159d53228aae13bbaa5.zip
edition: Fill in macro imports
Macros were previously imported through `#[macro_use] extern crate`,
which is basically a glob import of all macros from the crate. As of
2018 edition of Rust, `extern crate` is no longer required and macros
are imported individually like any other item from a dependency. This CL
fills in all the appropriate macro imports that will allow us to remove
our use of `extern crate` in a subsequent CL.

TEST=cargo check --all-features --tests
TEST=kokoro

Change-Id: If2ec08b06b743abf5f62677c6a9927c3d5d90a54
Reviewed-on: https://chromium-review.googlesource.com/1565546
Commit-Ready: David Tolnay <dtolnay@chromium.org>
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 'msg_socket')
-rw-r--r--msg_socket/msg_on_socket_derive/msg_on_socket_derive.rs3
-rw-r--r--msg_socket/src/lib.rs2
2 files changed, 3 insertions, 2 deletions
diff --git a/msg_socket/msg_on_socket_derive/msg_on_socket_derive.rs b/msg_socket/msg_on_socket_derive/msg_on_socket_derive.rs
index 724a29c..bb90255 100644
--- a/msg_socket/msg_on_socket_derive/msg_on_socket_derive.rs
+++ b/msg_socket/msg_on_socket_derive/msg_on_socket_derive.rs
@@ -15,7 +15,8 @@ extern crate syn;
 use std::vec::Vec;
 
 use proc_macro2::{Span, TokenStream};
-use syn::{Data, DataEnum, DataStruct, DeriveInput, Fields, Ident};
+use quote::quote;
+use syn::{parse_macro_input, Data, DataEnum, DataStruct, DeriveInput, Fields, Ident};
 
 /// The function that derives the recursive implementation for struct or enum.
 #[proc_macro_derive(MsgOnSocket)]
diff --git a/msg_socket/src/lib.rs b/msg_socket/src/lib.rs
index a43e030..c3cc411 100644
--- a/msg_socket/src/lib.rs
+++ b/msg_socket/src/lib.rs
@@ -16,7 +16,7 @@ use std::marker::PhantomData;
 use std::ops::Deref;
 use std::os::unix::io::{AsRawFd, RawFd};
 
-use sys_util::{net::UnixSeqpacket, Error as SysError, ScmSocket};
+use sys_util::{handle_eintr, net::UnixSeqpacket, Error as SysError, ScmSocket};
 
 pub use crate::msg_on_socket::*;
 pub use msg_on_socket_derive::*;