rename proven fields to "require"

hickory-dns · Mar 2, 2024 · cf0f048 · cf0f048
1 parent 32a4118
commit cf0f048
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/crates/proto/src/rr/dnssec/proof.rs b/crates/proto/src/rr/dnssec/proof.rs
@@ -340,11 +340,11 @@ impl<T> Proven<T> {
     ///
     /// let proven = Proven::new(Proof::Bogus, 42u32);
     ///
-    /// assert_eq!(*proven.try_borrow(Proof::Bogus).unwrap(), 42_u32);
-    /// assert_eq!(*proven.try_borrow(Proof::Bogus | Proof::Indeterminate).unwrap(), 42_u32);
-    /// assert_eq!(proven.try_borrow(Proof::Secure | Proof::Insecure).unwrap_err(), Proof::Bogus);
+    /// assert_eq!(*proven.require_as_ref(Proof::Bogus).unwrap(), 42_u32);
+    /// assert_eq!(*proven.require_as_ref(Proof::Bogus | Proof::Indeterminate).unwrap(), 42_u32);
+    /// assert_eq!(proven.require_as_ref(Proof::Secure | Proof::Insecure).unwrap_err(), Proof::Bogus);
     /// ```
-    pub fn try_borrow<I: Into<ProofFlags>>(&self, flags: I) -> Result<&T, Proof> {
+    pub fn require_as_ref<I: Into<ProofFlags>>(&self, flags: I) -> Result<&T, Proof> {
         if flags.into().contains(ProofFlags::from(self.proof)) {
             Ok(&self.value)
         } else {
@@ -359,11 +359,11 @@ impl<T> Proven<T> {
     ///
     /// let proven = Proven::new(Proof::Bogus, 42u32);
     ///
-    /// assert_eq!(proven.clone().try_take(Proof::Bogus).unwrap(), 42_u32);
-    /// assert_eq!(proven.clone().try_take(Proof::Bogus | Proof::Indeterminate).unwrap(), 42_u32);
-    /// assert!(proven.try_take(Proof::Secure | Proof::Insecure).is_err());
+    /// assert_eq!(proven.clone().require(Proof::Bogus).unwrap(), 42_u32);
+    /// assert_eq!(proven.clone().require(Proof::Bogus | Proof::Indeterminate).unwrap(), 42_u32);
+    /// assert!(proven.require(Proof::Secure | Proof::Insecure).is_err());
     /// ```
-    pub fn try_take<I: Into<ProofFlags>>(self, flags: I) -> Result<T, Self> {
+    pub fn require<I: Into<ProofFlags>>(self, flags: I) -> Result<T, Self> {
         if flags.into().contains(ProofFlags::from(self.proof)) {
             Ok(self.value)
         } else {

diff --git a/crates/resolver/src/lookup.rs b/crates/resolver/src/lookup.rs
@@ -768,11 +768,11 @@ pub mod tests {
         let mut lookup = lookup.dnssec_iter();
 
         assert_eq!(
-            *lookup.next().unwrap().try_take(Proof::Secure).unwrap(),
+            *lookup.next().unwrap().require(Proof::Secure).unwrap(),
             *a1.data().unwrap()
         );
         assert_eq!(
-            *lookup.next().unwrap().try_take(Proof::Insecure).unwrap(),
+            *lookup.next().unwrap().require(Proof::Insecure).unwrap(),
             *a2.data().unwrap()
         );
         assert_eq!(lookup.next(), None);