1
0
mirror of https://github.com/fafhrd91/actix-net synced 2025-06-26 20:57:43 +02:00

update all crates msrv to 1.57 (#464)

This commit is contained in:
Rob Ede
2022-07-23 01:51:12 +02:00
committed by GitHub
parent 126ed4c2e3
commit 66756bc448
18 changed files with 34 additions and 91 deletions

View File

@ -1,6 +1,7 @@
# Changes
## Unreleased - 2022-xx-xx
- Minimum supported Rust version (MSRV) is now 1.57.
## 3.0.4 - 2022-03-15

View File

@ -27,25 +27,25 @@ pub trait Host: Unpin + 'static {
impl Host for String {
fn hostname(&self) -> &str {
str_split_once(self, ':')
self.split_once(':')
.map(|(hostname, _)| hostname)
.unwrap_or(self)
}
fn port(&self) -> Option<u16> {
str_split_once(self, ':').and_then(|(_, port)| port.parse().ok())
self.split_once(':').and_then(|(_, port)| port.parse().ok())
}
}
impl Host for &'static str {
fn hostname(&self) -> &str {
str_split_once(self, ':')
self.split_once(':')
.map(|(hostname, _)| hostname)
.unwrap_or(self)
}
fn port(&self) -> Option<u16> {
str_split_once(self, ':').and_then(|(_, port)| port.parse().ok())
self.split_once(':').and_then(|(_, port)| port.parse().ok())
}
}
@ -69,11 +69,3 @@ mod tests {
assert_connection_info_eq!("example.com:false:false", "example.com", None);
}
}
// `str::split_once` is stabilized in 1.52.0
fn str_split_once(str: &str, delimiter: char) -> Option<(&str, &str)> {
let mut splitn = str.splitn(2, delimiter);
let prefix = splitn.next()?;
let suffix = splitn.next()?;
Some((prefix, suffix))
}