From 4fc3d8b5bac010608bd40704b7968d6949176169 Mon Sep 17 00:00:00 2001
From: David Pedersen <david.pdrsn@gmail.com>
Date: Tue, 15 Jun 2021 23:18:49 +0200
Subject: [PATCH] Replace unsafe with unwrap (#20)

---
 src/lib.rs  | 2 +-
 src/util.rs | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 93c98699..3ad89f1e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -602,7 +602,7 @@
     clippy::match_like_matches_macro,
     clippy::type_complexity
 )]
-#![deny(unsafe_code)]
+#![forbid(unsafe_code)]
 #![cfg_attr(docsrs, feature(doc_cfg))]
 #![cfg_attr(test, allow(clippy::float_cmp))]
 
diff --git a/src/util.rs b/src/util.rs
index 5e129b23..cdf437a0 100644
--- a/src/util.rs
+++ b/src/util.rs
@@ -12,10 +12,9 @@ impl ByteStr {
         Self(Bytes::copy_from_slice(s.as_ref().as_bytes()))
     }
 
-    #[allow(unsafe_code)]
     pub(crate) fn as_str(&self) -> &str {
-        // SAFETY: `ByteStr` can only be constructed from strings which are
-        // always valid utf-8.
-        unsafe { std::str::from_utf8_unchecked(&self.0) }
+        // `ByteStr` can only be constructed from strings which are always valid
+        // utf-8 so this wont panic.
+        std::str::from_utf8(&self.0).unwrap()
     }
 }