robin/warp-real-ip
1
0
Fork 0
mirror of https://github.com/icewind1991/warp-real-ip.git synced 2026-06-03 18:54:06 +02:00
Code Issues Projects Releases Wiki Activity

clippy lints

Browse source
This commit is contained in:
Robin Appelman 2021-08-18 17:07:54 +02:00
commit 744e0ade89
2 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -13,7 +13,7 @@ documentation = "https://docs.rs/warp-real-ip"
[dependencies] [dependencies]
warp = { version = "0.3" } warp = { version = "0.3" }
rfc7239 = "0.1" rfc7239 = "0.1"
ipnetwork = "~0.18" ipnetwork = "0.18"
[dev-dependencies] [dev-dependencies]
tokio = { version = "1.0", features = ["macros"] } tokio = { version = "1.0", features = ["macros"] }

23
src/lib.rs
View file

@ -23,31 +23,34 @@ impl IpNetworks {
impl From<Vec<IpAddr>> for IpNetworks { impl From<Vec<IpAddr>> for IpNetworks {
fn from(addrs: Vec<IpAddr>) -> Self { fn from(addrs: Vec<IpAddr>) -> Self {
Self::from_iter(addrs.iter()) addrs.iter().collect()
} }
} }
impl From<&Vec<IpAddr>> for IpNetworks { impl From<&Vec<IpAddr>> for IpNetworks {
fn from(addrs: &Vec<IpAddr>) -> Self { fn from(addrs: &Vec<IpAddr>) -> Self {
Self::from_iter(addrs.iter()) addrs.iter().collect()
} }
} }
impl<'a> FromIterator<&'a IpAddr> for IpNetworks { impl<'a> FromIterator<&'a IpAddr> for IpNetworks {
fn from_iter<T: IntoIterator<Item = &'a IpAddr>>(addrs: T) -> Self { fn from_iter<T: IntoIterator<Item = &'a IpAddr>>(addrs: T) -> Self {
Self::from_iter(addrs.into_iter().map(|&addr| -> IpNetwork { addrs
match addr { .into_iter()
IpAddr::V4(addr) => Ipv4Network::from(addr).into(), .map(|&addr| -> IpNetwork {
IpAddr::V6(addr) => Ipv6Network::from(addr).into(), match addr {
} IpAddr::V4(addr) => Ipv4Network::from(addr).into(),
})) IpAddr::V6(addr) => Ipv6Network::from(addr).into(),
}
})
.collect()
} }
} }
impl FromIterator<IpNetwork> for IpNetworks { impl FromIterator<IpNetwork> for IpNetworks {
fn from_iter<T: IntoIterator<Item = IpNetwork>>(addrs: T) -> Self { fn from_iter<T: IntoIterator<Item = IpNetwork>>(addrs: T) -> Self {
IpNetworks { IpNetworks {
networks: Vec::<IpNetwork>::from_iter(addrs), networks: addrs.into_iter().collect(),
} }
} }
} }
@ -162,7 +165,7 @@ impl<'a> Iterator for CommaSeparatedIterator<'a> {
type Item = &'a str; type Item = &'a str;
fn next(&mut self) -> Option<Self::Item> { fn next(&mut self) -> Option<Self::Item> {
while let Some((i, c)) = self.char_indices.next() { for (i, c) in &mut self.char_indices {
let (next, next_state) = match (self.state, c) { let (next, next_state) = match (self.state, c) {
(CommaSeparatedIteratorState::Default, '"') => { (CommaSeparatedIteratorState::Default, '"') => {
self.s = i; self.s = i;