From 1cf1579ebbf20590a8297c62cbf95ffaf095a9ca Mon Sep 17 00:00:00 2001
From: Richard Walters <rwalters@digitalstirling.com>
Date: Mon, 12 Oct 2020 14:31:57 -0700
Subject: Clean up Uri::parse_path and make it functional

---
 src/lib.rs | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index f5257b4..45400c6 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -934,35 +934,33 @@ impl Uri {
     }
 
     fn parse_path(path_string: &str) -> Result<Vec<Vec<u8>>, Error> {
-        // TODO: improvement: make an iterator and only collect at the end.
-        let mut path_encoded = Vec::<String>::new();
         match path_string {
             "/" => {
-                // Special case of a path that is empty but needs a single
-                // empty-string element to indicate that it is absolute.
-                path_encoded.push("".to_string());
+                // Special case of an empty absolute path, which we want to
+                // represent as single empty-string element to indicate that it
+                // is absolute.
+                Ok(vec![vec![]])
             },
 
             "" => {
+                // Special case of an empty relative path, which we want to
+                // represent as an empty vector.
+                Ok(vec![])
             },
 
             path_string => {
-                path_encoded = path_string
+                path_string
                     .split('/')
-                    .map(String::from)
+                    .map(|segment| {
+                        Self::decode_element(
+                            &segment,
+                            &PCHAR_NOT_PCT_ENCODED,
+                            Context::Path
+                        )
+                    })
                     .collect()
             }
         }
-        path_encoded.into_iter().map(
-            |segment| {
-                Self::decode_element(
-                    &segment,
-                    &PCHAR_NOT_PCT_ENCODED,
-                    Context::Path
-                )
-            }
-        )
-            .collect::<Result<Vec<Vec<u8>>, Error>>()
     }
 
     fn parse_query(query_and_or_fragment: &str) -> Result<Option<Vec<u8>>, Error> {
-- 
cgit v1.2.3