From 059ca7c3a1d91643877161b70850f1bb421475bd Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Sun, 20 Jan 2019 14:28:06 +0100 Subject: [PATCH] remove crate tokio-codec (seems to be part of tokio now) --- Cargo.toml | 1 - src/server/rest.rs | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 6bec796b..763bacdd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,6 @@ url = "1.7" futures = "0.1" tokio-threadpool = "0.1" tokio = "0.1" -tokio-codec = "0.1" http = "0.1" hyper = "0.12" lazy_static = "1.1" diff --git a/src/server/rest.rs b/src/server/rest.rs index 74cf1049..c4c78880 100644 --- a/src/server/rest.rs +++ b/src/server/rest.rs @@ -16,7 +16,6 @@ use futures::future::{self, Either}; //use tokio::prelude::*; //use tokio::timer::Delay; use tokio::fs::File; -use tokio_codec; //use bytes::{BytesMut, BufMut}; //use hyper::body::Payload; @@ -324,7 +323,7 @@ fn chuncked_static_file_download(filename: PathBuf) -> BoxFut { Box::new(File::open(filename) .map_err(|err| http_err!(BAD_REQUEST, format!("File open failed: {}", err))) .and_then(move |file| { - let payload = tokio_codec::FramedRead::new(file, tokio_codec::BytesCodec::new()). + let payload = tokio::codec::FramedRead::new(file, tokio::codec::BytesCodec::new()). map(|bytes| { //sigh - howto avoid copy here? or the whole map() ?? hyper::Chunk::from(bytes.to_vec())