Fix clippy

Author: sgrebnov

vortex-io/src/file/driver.rs

@@ -5,15 +5,14 @@ use std::pin::Pin;
 use std::task::{Context, Poll};
 
 use futures::Stream;
+#[cfg(all(test, not(feature = "tokio")))]
+use oneshot;
 use pin_project_lite::pin_project;
-use vortex_error::VortexExpect;
-use vortex_metrics::VortexMetrics;
-
 // Prefer tokio::sync::oneshot when tokio feature is enabled
 #[cfg(all(test, feature = "tokio"))]
 use tokio::sync::oneshot;
-#[cfg(all(test, not(feature = "tokio")))]
-use oneshot;
+use vortex_error::VortexExpect;
+use vortex_metrics::VortexMetrics;
 
 use crate::file::read::{
     CoalesceWindow, CoalescedRequest, IoRequest, ReadEvent, ReadRequest, RequestId,

vortex-io/src/file/read/mod.rs

@@ -15,16 +15,15 @@ use async_trait::async_trait;
 use futures::channel::mpsc;
 use futures::future::{BoxFuture, Shared};
 use futures::{FutureExt, TryFutureExt};
+#[cfg(not(feature = "tokio"))]
+use oneshot;
 pub use request::*;
 pub use source::*;
-use vortex_buffer::{Alignment, ByteBuffer};
-use vortex_error::{SharedVortexResult, VortexError, VortexResult, vortex_err};
-
 // Prefer tokio::sync::oneshot when tokio feature is enabled
 #[cfg(feature = "tokio")]
 use tokio::sync::oneshot;
-#[cfg(not(feature = "tokio"))]
-use oneshot;
+use vortex_buffer::{Alignment, ByteBuffer};
+use vortex_error::{SharedVortexResult, VortexError, VortexResult, vortex_err};
 
 use crate::VortexReadAt;
 

vortex-io/src/file/read/request.rs

@@ -6,14 +6,13 @@ use std::fmt::{Debug, Formatter};
 use std::ops::Range;
 use std::sync::Arc;
 
-use vortex_buffer::{Alignment, ByteBuffer};
-use vortex_error::{VortexError, VortexExpect, VortexResult};
-
+#[cfg(not(feature = "tokio"))]
+use oneshot;
 // Prefer tokio::sync::oneshot when tokio feature is enabled
 #[cfg(feature = "tokio")]
 use tokio::sync::oneshot;
-#[cfg(not(feature = "tokio"))]
-use oneshot;
+use vortex_buffer::{Alignment, ByteBuffer};
+use vortex_error::{VortexError, VortexExpect, VortexResult};
 
 /// An I/O request, either a single read or a coalesced set of reads.
 pub struct IoRequest(IoRequestInner);

vortex-io/src/runtime/handle.rs

@@ -7,13 +7,12 @@ use std::task::{Context, Poll, ready};
 
 use futures::channel::mpsc;
 use futures::{FutureExt, StreamExt};
-use vortex_error::{VortexResult, vortex_panic};
-
+#[cfg(not(feature = "tokio"))]
+use oneshot;
 // Prefer tokio::sync::oneshot when tokio feature is enabled
 #[cfg(feature = "tokio")]
 use tokio::sync::oneshot;
-#[cfg(not(feature = "tokio"))]
-use oneshot;
+use vortex_error::{VortexResult, vortex_panic};
 use vortex_metrics::VortexMetrics;
 
 use crate::file::{FileRead, IntoReadSource, IoRequestStream};

vortex-io/src/runtime/single.rs

@@ -7,15 +7,14 @@ use std::sync::Arc;
 use futures::future::BoxFuture;
 use futures::stream::LocalBoxStream;
 use futures::{Stream, StreamExt};
+#[cfg(not(feature = "tokio"))]
+use oneshot;
 use parking_lot::Mutex;
 use smol::LocalExecutor;
-use vortex_error::vortex_panic;
-
 // Prefer tokio::sync::oneshot when tokio feature is enabled
 #[cfg(feature = "tokio")]
 use tokio::sync::oneshot;
-#[cfg(not(feature = "tokio"))]
-use oneshot;
+use vortex_error::vortex_panic;
 
 use crate::runtime::smol::SmolAbortHandle;
 use crate::runtime::{AbortHandle, AbortHandleRef, BlockingRuntime, Executor, Handle, IoTask};