talksik/tonic
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(transport): Endpoint returns transport error (#920)

Browse Source
This commit is contained in:
Lucio Franco
2022-02-22 14:58:22 -05:00
committed by GitHub
parent 6bc7dab8e0
commit ee6e726707
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tonic/src/transport/channel/endpoint.rs
+7 -10
View File
@@ -6,10 +6,7 @@ use super::ClientTlsConfig;
use crate::transport::service::TlsConnector; use crate::transport::service::TlsConnector;
use crate::transport::Error; use crate::transport::Error;
use bytes::Bytes; use bytes::Bytes;
use http::{ use http::{uri::Uri, HeaderValue};
uri::{InvalidUri, Uri},
HeaderValue,
};
use std::{ use std::{
convert::{TryFrom, TryInto}, convert::{TryFrom, TryInto},
fmt, fmt,
@@ -76,8 +73,8 @@ impl Endpoint {
/// # use tonic::transport::Endpoint; /// # use tonic::transport::Endpoint;
/// Endpoint::from_shared("https://example.com".to_string()); /// Endpoint::from_shared("https://example.com".to_string());
/// ``` /// ```
pub fn from_shared(s: impl Into<Bytes>) -> Result<Self, InvalidUri> { pub fn from_shared(s: impl Into<Bytes>) -> Result<Self, Error> {
let uri = Uri::from_maybe_shared(s.into())?; let uri = Uri::from_maybe_shared(s.into()).map_err(|e| Error::new_invalid_uri().with(e))?;
Ok(Self::from(uri)) Ok(Self::from(uri))
} }
@@ -404,7 +401,7 @@ impl From<Uri> for Endpoint {
} }
impl TryFrom<Bytes> for Endpoint { impl TryFrom<Bytes> for Endpoint {
type Error = InvalidUri; type Error = Error;
fn try_from(t: Bytes) -> Result<Self, Self::Error> { fn try_from(t: Bytes) -> Result<Self, Self::Error> {
Self::from_shared(t) Self::from_shared(t)
@@ -412,7 +409,7 @@ impl TryFrom<Bytes> for Endpoint {
} }
impl TryFrom<String> for Endpoint { impl TryFrom<String> for Endpoint {
type Error = InvalidUri; type Error = Error;
fn try_from(t: String) -> Result<Self, Self::Error> { fn try_from(t: String) -> Result<Self, Self::Error> {
Self::from_shared(t.into_bytes()) Self::from_shared(t.into_bytes())
@@ -420,7 +417,7 @@ impl TryFrom<String> for Endpoint {
} }
impl TryFrom<&'static str> for Endpoint { impl TryFrom<&'static str> for Endpoint {
type Error = InvalidUri; type Error = Error;
fn try_from(t: &'static str) -> Result<Self, Self::Error> { fn try_from(t: &'static str) -> Result<Self, Self::Error> {
Self::from_shared(t.as_bytes()) Self::from_shared(t.as_bytes())
@@ -434,7 +431,7 @@ impl fmt::Debug for Endpoint {
} }
impl FromStr for Endpoint { impl FromStr for Endpoint {
type Err = InvalidUri; type Err = Error;
fn from_str(s: &str) -> Result<Self, Self::Err> { fn from_str(s: &str) -> Result<Self, Self::Err> {
Self::try_from(s.to_string()) Self::try_from(s.to_string())