Steam/garage
1
0
Fork 0
forked from Deuxfleurs/garage
Code Issues Pull requests Projects Releases Wiki Activity

simplify addresse deserialialiser and limit allocations

Browse source
This commit is contained in:
Trinity Pointard 2021-03-18 03:44:00 +01:00
parent ae3b7029a9
commit 81e9db783f
1 changed files with 7 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/util/config.rs
View file

@ -1,4 +1,3 @@
use std::fmt;
use std::io::Read; use std::io::Read;
use std::net::SocketAddr; use std::net::SocketAddr;
use std::path::PathBuf; use std::path::PathBuf;
@ -92,28 +91,13 @@ fn deserialize_addr<'de, D>(deserializer: D) -> Result<SocketAddr, D::Error>
where where
D: de::Deserializer<'de>, D: de::Deserializer<'de>,
{ {
struct AddrVisitor;
impl<'de> de::Visitor<'de> for AddrVisitor {
type Value = SocketAddr;
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
formatter.write_str("a string representing a socket address")
}
fn visit_str<E>(self, s: &str) -> Result<Self::Value, E>
where
E: de::Error,
{
use std::net::ToSocketAddrs; use std::net::ToSocketAddrs;
s.to_socket_addrs()
<&str>::deserialize(deserializer)?
.to_socket_addrs()
.map_err(|_| de::Error::custom("could not resolve to a socket address"))? .map_err(|_| de::Error::custom("could not resolve to a socket address"))?
.next() .next()
.ok_or(de::Error::custom("could not resolve to a socket address")) .ok_or(de::Error::custom("could not resolve to a socket address"))
}
}
deserializer.deserialize_any(AddrVisitor)
} }
fn deserialize_vec_addr<'de, D>(deserializer: D) -> Result<Vec<SocketAddr>, D::Error> fn deserialize_vec_addr<'de, D>(deserializer: D) -> Result<Vec<SocketAddr>, D::Error>
@ -123,7 +107,7 @@ where
use std::net::ToSocketAddrs; use std::net::ToSocketAddrs;
let mut res = vec![]; let mut res = vec![];
for s in <Vec<String>>::deserialize(deserializer)? { for s in <Vec<&str>>::deserialize(deserializer)? {
res.push( res.push(
s.to_socket_addrs() s.to_socket_addrs()
.map_err(|_| de::Error::custom("could not resolve to a socket address"))? .map_err(|_| de::Error::custom("could not resolve to a socket address"))?