Replace with std::mem::take

bitwarden · Jan 19, 2024 · 74a5b08 · 74a5b08
1 parent 8c869f2
commit 74a5b08
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/crates/bitwarden-crypto/src/decrypted.rs b/crates/bitwarden-crypto/src/decrypted.rs
@@ -20,13 +20,10 @@ impl<V: Zeroize> Decrypted<V> {
 impl TryFrom<Decrypted<Vec<u8>>> for Decrypted<String> {
     type Error = CryptoError;
 
-    fn try_from(v: Decrypted<Vec<u8>>) -> Result<Self, CryptoError> {
-        let mut str = v.expose().to_owned();
-
-        let rtn = String::from_utf8(str).map_err(|_| CryptoError::InvalidUtf8String);
-
-        str.zeroize();
+    fn try_from(mut v: Decrypted<Vec<u8>>) -> Result<Self, CryptoError> {
+        let value = std::mem::take(&mut v.value);
 
+        let rtn = String::from_utf8(value).map_err(|_| CryptoError::InvalidUtf8String);
         rtn.map(Decrypted::new)
     }
 }