start migration to edition 2018

tailhook · Nov 18, 2020 · e1e2477 · e1e2477
1 parent 722e0f3
commit e1e2477
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/examples/overlay_readonly.rs b/examples/overlay_readonly.rs
@@ -1,7 +1,7 @@
-extern crate libmount;
-extern crate argparse;
-extern crate env_logger;
-#[macro_use] extern crate log;
+use libmount;
+use argparse;
+use env_logger;
+use log::error;
 
 use std::path::PathBuf;
 use std::process::exit;

diff --git a/src/error.rs b/src/error.rs
@@ -2,7 +2,7 @@ use std::io;
 use std::fmt;
 use std::error::Error as StdError;
 
-use {OSError, Error, MountError};
+use crate::{OSError, Error, MountError};
 use remount::RemountError;
 
 impl OSError {

diff --git a/src/lib.rs b/src/lib.rs
@@ -22,10 +22,6 @@
 #![warn(missing_debug_implementations)]
 #![warn(missing_docs)]
 
-extern crate libc;
-extern crate nix;
-extern crate fs_err;
-
 mod util;
 mod error;
 mod explain;
@@ -39,12 +35,11 @@ pub mod mountinfo;
 use std::io;
 
 use explain::Explainable;
-use remount::RemountError;
 pub use bind::BindMount;
 pub use overlay::Overlay;
 pub use tmpfs::Tmpfs;
 pub use modify::Move;
-pub use remount::Remount;
+pub use remount::{Remount,RemountError};
 
 #[derive(Debug, thiserror::Error)]
 #[allow(missing_docs)]