utils: use prelude instead of ad-hoc imports

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/src/prelude.rs b/src/prelude.rs
index 473a499159b183d6802b760ea999788e15bb5c54..dfa31e899d1280005d02d3b7e7964bc2f84ed160 100644 (file)
--- a/src/prelude.rs
+++ b/src/prelude.rs
@@ -31,9 +31,10 @@ pub use std::iter::repeat_with;
 pub use std::marker::PhantomData;
 pub use std::mem;
 pub use std::num::{NonZeroUsize, TryFromIntError, Wrapping};
-pub use std::ops::{Deref, DerefMut};
+pub use std::ops::{Deref, DerefMut, Index};
 pub use std::os::unix;
 pub use std::os::unix::ffi::OsStrExt;
+pub use std::os::unix::io::IntoRawFd;
 pub use std::os::unix::net::UnixStream;
 pub use std::os::unix::process::CommandExt;
 pub use std::path::PathBuf;

diff --git a/src/utils.rs b/src/utils.rs
index f1916866e3dbccbc9a18835bc9df4e63ed35e2ac..a5753a902c00bbea5616a520a942ebb0d1d081c3 100644 (file)
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -3,17 +3,7 @@
 // There is NO WARRANTY.
 
 use crate::imports::*;
-
-use std::fmt::{self, Debug};
-use std::fs;
-use std::io;
-use std::ops::{Deref, Index};
-use std::os::unix::io::IntoRawFd;
-
-use arrayvec::ArrayVec;
-use derive_more::*;
-use fehler::{throw, throws};
-use libc;
+use crate::prelude::*;
 
 #[macro_export]
 macro_rules! ensure_eq {