From 94cc4b8ce1f3ef90ff8203c4df7b7f761bc56303 Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Thu, 25 Feb 2021 21:17:23 +0600
Subject: [PATCH] fix tests

---
 ntex-files/src/lib.rs        | 8 +++++---
 ntex-multipart/src/server.rs | 6 +++---
 ntex-session/src/cookie.rs   | 2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ntex-files/src/lib.rs b/ntex-files/src/lib.rs
index 9830bce5..21e749d0 100644
--- a/ntex-files/src/lib.rs
+++ b/ntex-files/src/lib.rs
@@ -3,11 +3,12 @@
 //! Static files support
 use std::fs::{DirEntry, File};
 use std::path::{Path, PathBuf};
-use std::{fmt::Write, pin::Pin, rc::Rc, cmp, io, io::Read, io::Seek, task::Context, task::Poll};
+use std::{
+    cmp, fmt::Write, io, io::Read, io::Seek, pin::Pin, rc::Rc, task::Context, task::Poll,
+};
 
-use ntex::util::Bytes;
 use futures::future::{ok, ready, Either, FutureExt, LocalBoxFuture, Ready};
-use futures::{Stream, Future};
+use futures::{Future, Stream};
 use hyperx::header::DispositionType;
 use mime_guess::from_ext;
 use ntex::http::error::BlockingError;
@@ -15,6 +16,7 @@ use ntex::http::{header, Method, Payload, Uri};
 use ntex::router::{ResourceDef, ResourcePath};
 use ntex::service::boxed::{self, BoxService, BoxServiceFactory};
 use ntex::service::{IntoServiceFactory, Service, ServiceFactory};
+use ntex::util::Bytes;
 use ntex::web::dev::{WebRequest, WebResponse, WebServiceConfig, WebServiceFactory};
 use ntex::web::error::ErrorRenderer;
 use ntex::web::guard::Guard;
diff --git a/ntex-multipart/src/server.rs b/ntex-multipart/src/server.rs
index 703c8bc7..bb7e494c 100644
--- a/ntex-multipart/src/server.rs
+++ b/ntex-multipart/src/server.rs
@@ -1,13 +1,13 @@
 //! Multipart payload support
 use std::cell::{Cell, RefCell, RefMut};
-use std::{cmp, fmt, convert::TryFrom, marker::PhantomData, pin::Pin, rc::Rc};
 use std::task::{Context, Poll};
+use std::{cmp, convert::TryFrom, fmt, marker::PhantomData, pin::Pin, rc::Rc};
 
-use ntex::util::{Bytes, BytesMut};
 use futures::stream::{LocalBoxStream, Stream, StreamExt};
 use ntex::http::error::{ParseError, PayloadError};
 use ntex::http::header::{self, HeaderMap, HeaderName, HeaderValue};
 use ntex::task::LocalWaker;
+use ntex::util::{Bytes, BytesMut};
 
 use crate::error::MultipartError;
 
@@ -753,10 +753,10 @@ impl PayloadBuffer {
 mod tests {
     use super::*;
 
-    use bytes::Bytes;
     use futures::future::lazy;
     use ntex::channel::mpsc;
     use ntex::http::h1::Payload;
+    use ntex::util::Bytes;
 
     #[ntex::test]
     async fn test_boundary() {
diff --git a/ntex-session/src/cookie.rs b/ntex-session/src/cookie.rs
index 91f8157d..9570dc26 100644
--- a/ntex-session/src/cookie.rs
+++ b/ntex-session/src/cookie.rs
@@ -382,7 +382,7 @@ where
 #[cfg(test)]
 mod tests {
     use super::*;
-    use bytes::Bytes;
+    use ntex::util::Bytes;
     use ntex::web::{self, test, App};
 
     #[ntex::test]