diff --git a/crates/safelog/semver.md b/crates/safelog/semver.md new file mode 100644 index 000000000..2495e640d --- /dev/null +++ b/crates/safelog/semver.md @@ -0,0 +1,2 @@ +ADDED: Sensitive::into_inner +DEPRECATED: Sensitive::unwrap diff --git a/crates/safelog/src/lib.rs b/crates/safelog/src/lib.rs index ecf238efc..dd44b98b3 100644 --- a/crates/safelog/src/lib.rs +++ b/crates/safelog/src/lib.rs @@ -86,10 +86,14 @@ impl Sensitive { } /// Extract the inner value from this `Sensitive`. - // - // TODO(Diziet) shouldn't this be called `into_inner` ? + pub fn into_inner(self) -> T { + self.0 + } + + /// Extract the inner value from this `Sensitive`. + #[deprecated = "Use the new into_inner method instead"] pub fn unwrap(sensitive: Sensitive) -> T { - sensitive.0 + sensitive.into_inner() } /// Converts `&Sensitive` to `Sensitive<&T>` @@ -171,7 +175,7 @@ impl BoxSensitive { pub fn into_inner(self) -> T { // TODO want unstable Box::into_inner(self.0) rust-lang/rust/issues/80437 let unboxed = *self.0; - Sensitive::unwrap(unboxed) + unboxed.into_inner() } } @@ -343,10 +347,20 @@ mod test { assert_eq!(format!("{:?}", &sv), "[104, 49]"); assert_eq!(sv, SVec::from(vec![104, 49])); - assert_eq!(SVec::unwrap(sv.clone()), vec![104, 49]); + assert_eq!(sv.clone().into_inner(), vec![104, 49]); assert_eq!(*sv, vec![104, 49]); } + #[test] + #[serial] + #[allow(deprecated)] + fn deprecated() { + type SVec = Sensitive>; + let sv = Sensitive(vec![104, 49]); + + assert_eq!(SVec::unwrap(sv), vec![104, 49]); + } + #[test] #[serial] fn display_various() {