Implement methods directly not via trait

Author: kornelski

security-framework/src/item.rs

@@ -152,15 +152,24 @@ pub struct ItemSearchOptions {
 }
 
 #[cfg(target_os = "macos")]
-impl crate::ItemSearchOptionsInternals for ItemSearchOptions {
+impl ItemSearchOptions {
+    /// Search within the specified macOS keychains.
+    ///
+    /// If this is not called, the default keychain will be searched.
     #[inline]
-    fn keychains(&mut self, keychains: &[SecKeychain]) -> &mut Self {
+    pub fn keychains(&mut self, keychains: &[SecKeychain]) -> &mut Self {
         self.keychains = Some(CFArray::from_CFTypes(keychains));
         self
     }
 
+    /// Only search the protected data macOS keychains.
+    ///
+    /// Has no effect if a legacy keychain has been explicitly specified
+    /// using [keychains](ItemSearchOptions::keychains).
+    ///
+    /// Has no effect except in sandboxed applications on macOS 10.15 and above
     #[inline]
-    fn ignore_legacy_keychains(&mut self) -> &mut Self {
+    pub fn ignore_legacy_keychains(&mut self) -> &mut Self {
         self.ignore_legacy_keychains = true;
         self
     }

security-framework/src/lib.rs

@@ -61,12 +61,6 @@ trait Pkcs12ImportOptionsInternals {
     fn access(&mut self, access: SecAccess) -> &mut Self;
 }
 
-#[cfg(target_os = "macos")]
-trait ItemSearchOptionsInternals {
-    fn keychains(&mut self, keychains: &[SecKeychain]) -> &mut Self;
-    fn ignore_legacy_keychains(&mut self) -> &mut Self;
-}
-
 trait AsInner {
     type Inner;
     fn as_inner(&self) -> Self::Inner;

security-framework/src/os/macos/item.rs

@@ -1,44 +1,34 @@
 //! OSX specific functionality for items.
 use crate::item::ItemSearchOptions;
 use crate::os::macos::keychain::SecKeychain;
-use crate::ItemSearchOptionsInternals;
 
 // Moved to crate::Key
 pub use crate::key::KeyType;
 
-/// An extension trait adding OSX specific functionality to `ItemSearchOptions`.
+// TODO: mark as deprecated
+#[doc(hidden)]
+/// An obsolete trait for `ItemSearchOptions`. Use methods on `ItemSearchOptions` directly.
 pub trait ItemSearchOptionsExt {
     /// Search within the specified keychains.
     ///
     /// If this is not called, the default keychain will be searched.
     fn keychains(&mut self, keychains: &[SecKeychain]) -> &mut Self;
 
-    /// Only search the protected data keychains.
-    ///
-    /// Has no effect if a legacy keychain has been explicitly specified
-    /// using [keychains](ItemSearchOptionsExt::keychains).
-    ///
-    /// Has no effect except in sandboxed applications on macOS 10.15 and above
-    fn ignore_legacy_keychains(&mut self) -> &mut Self;
+    // Do not extend this trait; use `impl ItemSearchOptions` directly
 }
 
 impl ItemSearchOptionsExt for ItemSearchOptions {
-    #[inline(always)]
     fn keychains(&mut self, keychains: &[SecKeychain]) -> &mut Self {
-        ItemSearchOptionsInternals::keychains(self, keychains)
+        ItemSearchOptions::keychains(self, keychains)
     }
 
-    #[inline(always)]
-    fn ignore_legacy_keychains(&mut self) -> &mut Self {
-        ItemSearchOptionsInternals::ignore_legacy_keychains(self)
-    }
+    // Do not extend this trait; use `impl ItemSearchOptions` directly
 }
 
 #[cfg(test)]
 mod test {
     use crate::item::*;
     use crate::os::macos::certificate::SecCertificateExt;
-    use crate::os::macos::item::ItemSearchOptionsExt;
     use crate::os::macos::test::keychain;
     use tempfile::tempdir;