mirror of
https://github.com/EasyTier/EasyTier.git
synced 2026-05-07 10:14:35 +00:00
proto: add some conversion for Url (#2067)
This commit is contained in:
@@ -257,15 +257,21 @@ impl FromStr for IpInet {
|
|||||||
|
|
||||||
impl From<url::Url> for Url {
|
impl From<url::Url> for Url {
|
||||||
fn from(value: url::Url) -> Self {
|
fn from(value: url::Url) -> Self {
|
||||||
Url {
|
Url { url: value.into() }
|
||||||
url: value.to_string(),
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl TryFrom<&Url> for url::Url {
|
||||||
|
type Error = url::ParseError;
|
||||||
|
|
||||||
|
fn try_from(value: &Url) -> Result<Self, Self::Error> {
|
||||||
|
value.url.parse()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl From<Url> for url::Url {
|
impl From<Url> for url::Url {
|
||||||
fn from(value: Url) -> Self {
|
fn from(value: Url) -> Self {
|
||||||
url::Url::parse(&value.url).unwrap()
|
(&value).try_into().expect("failed to parse url")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -273,9 +279,7 @@ impl FromStr for Url {
|
|||||||
type Err = url::ParseError;
|
type Err = url::ParseError;
|
||||||
|
|
||||||
fn from_str(s: &str) -> Result<Self, Self::Err> {
|
fn from_str(s: &str) -> Result<Self, Self::Err> {
|
||||||
Ok(Url {
|
url::Url::try_from(s).map(Into::into)
|
||||||
url: s.parse::<url::Url>()?.to_string(),
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user