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

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

View File

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

View File

@@ -79,7 +79,10 @@ impl Destination {
/// Get the port, if specified.
#[inline]
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.
@@ -140,7 +143,7 @@ impl Destination {
.map_err(::error::Parse::from)?
} else {
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());
}
auth