lib/ureq
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix some warnings by moving imports around

Browse Source
This commit is contained in:
Martin Algesten
2020-04-12 13:48:11 +02:00
parent 8c2d035809
commit a75d924f96
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/stream.rs
View File

@@ -2,7 +2,6 @@ use std::io::{Cursor, ErrorKind, Read, Result as IoResult, Write};
use std::net::SocketAddr; use std::net::SocketAddr;
use std::net::TcpStream; use std::net::TcpStream;
use std::net::ToSocketAddrs; use std::net::ToSocketAddrs;
use std::thread;
use std::time::Duration; use std::time::Duration;
#[cfg(feature = "tls")] #[cfg(feature = "tls")]
@@ -10,13 +9,6 @@ use rustls::ClientSession;
#[cfg(feature = "tls")] #[cfg(feature = "tls")]
use rustls::StreamOwned; use rustls::StreamOwned;
#[cfg(feature = "socks-proxy")]
use socks::{Socks5Stream, ToTargetAddr};
#[cfg(feature = "socks-proxy")]
use std::sync::mpsc::channel;
#[cfg(feature = "socks-proxy")]
use std::sync::{Arc, Condvar, Mutex};
use crate::proxy::Proto; use crate::proxy::Proto;
use crate::proxy::Proxy; use crate::proxy::Proxy;
@@ -294,7 +286,11 @@ fn connect_socks5(
// # Defects // # Defects
// 1) In the event of a timeout, a thread may be left running in the background. // 1) In the event of a timeout, a thread may be left running in the background.
// TODO: explore supporting timeouts upstream in Socks5Proxy. // TODO: explore supporting timeouts upstream in Socks5Proxy.
#[allow(clippy::mutex_atomic)]
let stream = if timeout_connect > 0 { let stream = if timeout_connect > 0 {
use std::sync::{Arc, Condvar, Mutex};
use std::thread;
use std::sync::mpsc::channel;
let master_signal = Arc::new((Mutex::new(false), Condvar::new())); let master_signal = Arc::new((Mutex::new(false), Condvar::new()));
let slave_signal = master_signal.clone(); let slave_signal = master_signal.clone();
let (tx, rx) = channel(); let (tx, rx) = channel();
@@ -345,6 +341,7 @@ fn get_socks5_stream(
proxy_addr: &SocketAddr, proxy_addr: &SocketAddr,
host_addr: &SocketAddr, host_addr: &SocketAddr,
) -> Result<TcpStream, std::io::Error> { ) -> Result<TcpStream, std::io::Error> {
use socks::{Socks5Stream, ToTargetAddr};
if proxy.use_authorization() { if proxy.use_authorization() {
let stream = Socks5Stream::connect_with_password( let stream = Socks5Stream::connect_with_password(
proxy_addr, proxy_addr,