From 877401cfa7c2885ee34c58917c4f7d26a25a2146 Mon Sep 17 00:00:00 2001 From: Richard Walters Date: Mon, 12 Oct 2020 15:30:55 -0700 Subject: Clean up Uri::host --- src/lib.rs | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index e5c4804..554a4a2 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -642,29 +642,9 @@ impl Uri { #[must_use = "why u no use host return value?"] pub fn host(&self) -> Option<&[u8]> { - // Here is another way to do the same thing, but with some Rust-fu. - // Credit goes to everx80, ABuffSeagull, and silen_z: - // - // self.authority - // .as_ref() - // .and_then( - // |authority| authority.host.as_deref() - // ) - // - // * First `as_ref` gets our authority from `&Option` into - // `Option<&Authority>` (there is an implicit borrow of - // `self.authority` first). - // * Next, `and_then` basically converts `Option<&Authority>` - // into `Option<&[u8]>` by leveraging the closure we provide - // to convert `&Authority` into `Option<&[u8]>`. - // * Finally, our closure uses `as_deref` to turn our `Option>` - // into an `Option<&[u8]>` since Vec implements DeRef with - // `Target=[T]` - if let Some(authority) = &self.authority { - Some(authority.host()) - } else { - None - } + self.authority + .as_ref() + .map(Authority::host) } fn is_path_absolute(path: &[Vec]) -> bool { -- cgit v1.2.3