From 0e6cef2de2760f81621748c1468ba93b3e30cef3 Mon Sep 17 00:00:00 2001
From: Richard Walters <rwalters@digitalstirling.com>
Date: Wed, 7 Oct 2020 18:49:14 -0700
Subject: (Rust) Add Uri::path_as_string convenience function

---
 src/lib.rs | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 819abf6..9508c56 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -190,6 +190,12 @@ impl From<percent_encoded_character_decoder::Error> for Error {
     }
 }
 
+impl From<std::string::FromUtf8Error> for Error {
+    fn from(_: std::string::FromUtf8Error) -> Self {
+        Error::IllegalCharacter
+    }
+}
+
 // TODO: explore possibly returning an iterator instead of a String
 fn encode_element(
     element: &[u8],
@@ -961,6 +967,16 @@ impl Uri {
         &self.path
     }
 
+    #[must_use = "we went through all that trouble to put the path into a string, and you don't want it?"]
+    pub fn path_as_string(&self) -> Result<String, Error> {
+        Ok(
+            String::from_utf8(
+                self.path
+                    .join(&b"/"[..])
+            )?
+        )
+    }
+
     #[must_use = "why did you get the port number and then throw it away?"]
     pub fn port(&self) -> Option<u16> {
         if let Some(authority) = &self.authority {
@@ -1171,6 +1187,9 @@ impl std::fmt::Display for Uri {
     }
 }
 
+// TODO: Numerous tests use `Uri::path` when it would be easier to read if they
+// used `Uri::path_as_string` instead.
+
 #[cfg(test)]
 mod tests {
 
@@ -1182,14 +1201,8 @@ mod tests {
         assert!(uri.is_ok());
         let uri = uri.unwrap();
         assert_eq!(None, uri.scheme());
-        // TODO: needs improvement; I don't like having to spam `to_vec`.
-        // [15:49] kimundi2016: &b""[..] may also work
-        //   Indeed, we could replace `.to_vec()` with `[..]`.
-        //
-        // Maybe we just make a convenience method we could use like this:
-        // assert_eq!("foo/bar", uri.path_as_str());
-        assert_eq!(&[&b"foo"[..], &b"bar"[..]].to_vec(), uri.path());
-        assert_eq!(uri.path(), &[&b"foo"[..], &b"bar"[..]].to_vec());
+        assert_eq!("foo/bar", uri.path_as_string().unwrap());
+        assert_eq!(uri.path_as_string().unwrap(), "foo/bar");
     }
 
     #[test]
-- 
cgit v1.2.3