forked/hyper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(client): update from deprecated Uri::port to port_part (#1722)

Browse Source
This commit is contained in:
Jeff Labonte
2018-11-26 13:06:40 -05:00
committed by Sean McArthur
parent 7fb6e3a3ff
commit 69368f433f
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/connect/http.rs
View File

@@ -234,8 +234,8 @@ where
Some(s) => s, Some(s) => s,
None => return invalid_url(InvalidUrl::MissingAuthority, &self.handle), None => return invalid_url(InvalidUrl::MissingAuthority, &self.handle),
}; };
let port = match dst.uri.port() { let port = match dst.uri.port_part() {
Some(port) => port, Some(port) => port.as_u16(),
None => if dst.uri.scheme_part() == Some(&Scheme::HTTPS) { 443 } else { 80 }, None => if dst.uri.scheme_part() == Some(&Scheme::HTTPS) { 443 } else { 80 },
}; };

7
src/client/connect/mod.rs
View File

@@ -79,7 +79,10 @@ impl Destination {
/// Get the port, if specified. /// Get the port, if specified.
#[inline] #[inline]
pub fn port(&self) -> Option<u16> { pub fn port(&self) -> Option<u16> {
self.uri.port() match self.uri.port_part() {
Some(port) => Some(port.as_u16()),
None => None
}
} }
/// Update the scheme of this destination. /// Update the scheme of this destination.
@@ -140,7 +143,7 @@ impl Destination {
.map_err(::error::Parse::from)? .map_err(::error::Parse::from)?
} else { } else {
let auth = host.parse::<uri::Authority>().map_err(::error::Parse::from)?; let auth = host.parse::<uri::Authority>().map_err(::error::Parse::from)?;
if auth.port().is_some() { if auth.port_part().is_some() { // std::uri::Authority::Uri
return Err(::error::Parse::Uri.into()); return Err(::error::Parse::Uri.into());
} }
auth auth

7
src/client/mod.rs
View File

@@ -212,8 +212,9 @@ where C: Connect + Sync + 'static,
format!("{}://{}", scheme, auth) format!("{}://{}", scheme, auth)
} }
(None, Some(auth)) if is_http_connect => { (None, Some(auth)) if is_http_connect => {
let scheme = match auth.port() { let port = auth.port_part().unwrap();
Some(443) => { let scheme = match port.as_str() {
"443" => {
set_scheme(req.uri_mut(), Scheme::HTTPS); set_scheme(req.uri_mut(), Scheme::HTTPS);
"https" "https"
}, },
@@ -278,7 +279,7 @@ where C: Connect + Sync + 'static,
.expect("HOST is always valid header name") .expect("HOST is always valid header name")
.or_insert_with(|| { .or_insert_with(|| {
let hostname = uri.host().expect("authority implies host"); let hostname = uri.host().expect("authority implies host");
if let Some(port) = uri.port() { if let Some(port) = uri.port_part() {
let s = format!("{}:{}", hostname, port); let s = format!("{}:{}", hostname, port);
HeaderValue::from_str(&s) HeaderValue::from_str(&s)
} else { } else {