From 6534dc4d1fdbbc951110713b8263427cd102f8a6 Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Fri, 9 Dec 2022 10:53:50 +0100
Subject: [PATCH] Add TryFrom<&Bytes> and TryFrom<&BytesMut> for ByteString

---
 ntex-bytes/CHANGELOG.md  |  4 ++++
 ntex-bytes/Cargo.toml    |  4 ++--
 ntex-bytes/src/string.rs | 28 ++++++++++++++++++++++++++++
 ntex/Cargo.toml          |  2 +-
 4 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/ntex-bytes/CHANGELOG.md b/ntex-bytes/CHANGELOG.md
index f5531e5d..0bc1cc9b 100644
--- a/ntex-bytes/CHANGELOG.md
+++ b/ntex-bytes/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changes
 
+## [0.1.17] (2022-12-09)
+
+* Add TryFrom<&Bytes> and TryFrom<&BytesMut> for ByteString
+
 ## [0.1.16] (2022-07-07)
 
 * Add ByteString::clear() method
diff --git a/ntex-bytes/Cargo.toml b/ntex-bytes/Cargo.toml
index b0c8fc81..ace7a229 100644
--- a/ntex-bytes/Cargo.toml
+++ b/ntex-bytes/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ntex-bytes"
-version = "0.1.16"
+version = "0.1.17"
 license = "MIT"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>", "Carl Lerche <me@carllerche.com>"]
 description = "Types and traits for working with bytes (bytes crate fork)"
@@ -22,7 +22,7 @@ bitflags = "1.3"
 bytes = "1.0.0"
 serde = "1.0.0"
 futures-core = { version = "0.3", default-features = false, features = ["alloc"] }
-simdutf8 = { version = "0.1.3", optional = true }
+simdutf8 = { version = "0.1.4", optional = true }
 
 [dev-dependencies]
 serde_test = "1.0"
diff --git a/ntex-bytes/src/string.rs b/ntex-bytes/src/string.rs
index 2fa6ffc8..379085d9 100644
--- a/ntex-bytes/src/string.rs
+++ b/ntex-bytes/src/string.rs
@@ -277,6 +277,19 @@ impl TryFrom<Bytes> for ByteString {
     }
 }
 
+impl TryFrom<&Bytes> for ByteString {
+    type Error = ();
+
+    #[inline]
+    fn try_from(value: &Bytes) -> Result<Self, Self::Error> {
+        if utf8::is_valid(value) {
+            Ok(ByteString(value.clone()))
+        } else {
+            Err(())
+        }
+    }
+}
+
 impl TryFrom<BytesMut> for ByteString {
     type Error = ();
 
@@ -290,6 +303,19 @@ impl TryFrom<BytesMut> for ByteString {
     }
 }
 
+impl<'a> TryFrom<&'a BytesMut> for ByteString {
+    type Error = ();
+
+    #[inline]
+    fn try_from(value: &'a BytesMut) -> Result<Self, Self::Error> {
+        if utf8::is_valid(value) {
+            Ok(ByteString(value.clone().freeze()))
+        } else {
+            Err(())
+        }
+    }
+}
+
 impl TryFrom<BytesVec> for ByteString {
     type Error = ();
 
@@ -432,7 +458,9 @@ mod test {
         let _ = ByteString::try_from(&b"nice bytes"[..]).unwrap();
         let _ = ByteString::try_from(b"nice bytes".to_vec()).unwrap();
         let _ = ByteString::try_from(Bytes::from_static(b"nice bytes")).unwrap();
+        let _ = ByteString::try_from(&Bytes::from_static(b"nice bytes")).unwrap();
         let _ = ByteString::try_from(BytesMut::from(&b"nice bytes"[..])).unwrap();
+        let _ = ByteString::try_from(&BytesMut::from(&b"nice bytes"[..])).unwrap();
         let _ =
             ByteString::try_from(BytesVec::copy_from_slice(&b"nice bytes"[..])).unwrap();
     }
diff --git a/ntex/Cargo.toml b/ntex/Cargo.toml
index 589c1eed..7ec2c66e 100644
--- a/ntex/Cargo.toml
+++ b/ntex/Cargo.toml
@@ -55,7 +55,7 @@ ntex-router = "0.5.1"
 ntex-service = "0.3.2"
 ntex-macros = "0.1.3"
 ntex-util = "0.1.18"
-ntex-bytes = "0.1.16"
+ntex-bytes = "0.1.17"
 ntex-h2 = "0.1.6"
 ntex-rt = "0.4.6"
 ntex-io = "0.1.11"