From 84fd65fb855ca31d17db315d9beb4ed35113c7c7 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Fri, 15 May 2020 14:06:22 -0400 Subject: [PATCH] netdoc: Improve parsing implementation for RelayFamily. --- tor-netdoc/src/routerdesc.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tor-netdoc/src/routerdesc.rs b/tor-netdoc/src/routerdesc.rs index ab67b3ce7..dfd78a9a5 100644 --- a/tor-netdoc/src/routerdesc.rs +++ b/tor-netdoc/src/routerdesc.rs @@ -97,11 +97,11 @@ pub struct RelayFamily(Vec); impl std::str::FromStr for RelayFamily { type Err = Error; fn from_str(s: &str) -> Result { - let mut family = RelayFamily(Vec::new()); - for ent in s.split(crate::tokenize::is_sp) { - family.0.push(parse_family_ent(ent)?); - } - Ok(family) + let v: Result> = s + .split(crate::tokenize::is_sp) + .map(parse_family_ent) + .collect(); + Ok(RelayFamily(v?)) } }