Switch ureq to used forked chunked_transfer.

This commit is contained in:
Jacob Hoffman-Andrews
2022-11-27 22:32:15 -08:00
committed by Martin Algesten
parent 43a12cdf51
commit 6bef9daa8e
8 changed files with 9 additions and 12 deletions

View File

@@ -25,7 +25,7 @@ use std::io::Result as IoResult;
///
/// # Example
///
/// ```
/// ```no_compile
/// use chunked_transfer::Decoder;
/// use std::io::Read;
///

View File

@@ -21,7 +21,7 @@ use std::io::Write;
///
/// # Example
///
/// ```
/// ```no_compile
/// use chunked_transfer::Encoder;
/// use std::io::Write;
///

View File

@@ -12,7 +12,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#![allow(dead_code)]
mod decoder;
pub use decoder::Decoder;

View File

@@ -346,6 +346,7 @@
mod agent;
mod body;
mod chunked;
mod error;
mod header;
mod middleware;

View File

@@ -448,7 +448,6 @@ mod tests {
#[cfg(feature = "gzip")]
fn read_exact_chunked_gzip() {
use crate::response::Compression;
use chunked_transfer::Decoder as ChunkDecoder;
use std::io::Cursor;
let gz_body = vec![
@@ -476,7 +475,7 @@ mod tests {
PoolReturner::new(agent.clone(), PoolKey::from_parts("http", "1.1.1.1", 8080)),
);
let chunked = ChunkDecoder::new(stream);
let chunked = crate::chunked::Decoder::new(stream);
let pool_return_read: Box<(dyn Read + Send + Sync + 'static)> =
Box::new(PoolReturnRead::new(chunked));

View File

@@ -4,11 +4,11 @@ use std::num::NonZeroUsize;
use std::str::FromStr;
use std::{fmt, io::BufRead};
use chunked_transfer::Decoder as ChunkDecoder;
use log::debug;
use url::Url;
use crate::body::SizedReader;
use crate::chunked::Decoder as ChunkDecoder;
use crate::error::{Error, ErrorKind::BadStatus};
use crate::header::{get_all_headers, get_header, Header, HeaderLine};
use crate::pool::{PoolReturnRead, PoolReturner};

View File

@@ -6,17 +6,15 @@ use std::time::Duration;
use std::time::Instant;
use std::{fmt, io::Cursor};
use chunked_transfer::Decoder as ChunkDecoder;
#[cfg(feature = "socks-proxy")]
use socks::{TargetAddr, ToTargetAddr};
use crate::chunked::Decoder as ChunkDecoder;
use crate::error::ErrorKind;
use crate::pool::{PoolKey, PoolReturner};
use crate::proxy::Proxy;
use crate::{error::Error, proxy::Proto};
use crate::error::ErrorKind;
use crate::unit::Unit;
use crate::{error::Error, proxy::Proto};
/// Trait for things implementing [std::io::Read] + [std::io::Write]. Used in [TlsConnector].
pub trait ReadWrite: Read + Write + Send + Sync + fmt::Debug + 'static {