feat(utils): resurrect the AlpmExt trait

This required fixing `find_local_satisfier` which wasn't compiling. This
module had been previously left out of the module tree, so the broken
code was never compiled and thus never detected.

Author: fosskers

alpm-utils/src/alpm.rs

@@ -1,22 +1,28 @@
 use crate::depends::satisfies_ver;
+use alpm::{Alpm, Depend, Package, Result};
 
-use alpm::{Alpm, Result, Package, Depend};
-
+/// Extension methods to the [`Alpm`] type.
 pub trait AlpmExt {
-    fn find_local_satisfier<S: Into<String>>(&self, pkg: S) -> Result<Option<Package>>;
+    /// Try to find a [`Package`] that satisfies a given dependency.
+    fn find_local_satisfier<S>(&self, pkg: S) -> Result<Option<Package>>
+    where
+        S: Into<String>;
 }
 
 impl AlpmExt for Alpm {
-    fn find_local_satisfier<S: Into<String>>(&self, pkg: S) -> Result<Option<Package>> {
+    fn find_local_satisfier<S>(&self, pkg: S) -> Result<Option<Package>>
+    where
+        S: Into<String>,
+    {
         let localdb = self.localdb();
         let pkg = pkg.into();
 
-        if let Ok(alpm_pkg) = localdb.pkg(&pkg) {
-            if satisfies_ver(&Depend::new(&pkg), alpm_pkg.version()) {
+        if let Ok(alpm_pkg) = localdb.pkg(pkg.as_str()) {
+            if satisfies_ver(Depend::new(pkg.as_str()), alpm_pkg.version()) {
                 return Ok(Some(alpm_pkg));
             }
         }
 
-        return Ok(localdb.pkgs()?.find_satisfier(pkg));
+        Ok(localdb.pkgs().find_satisfier(pkg))
     }
 }

alpm-utils/src/depends.rs

@@ -1,11 +1,7 @@
 use alpm::{AsDep, DepModVer, Ver};
 
 /// Checks if a dependency is satisfied by a package (name + version).
-pub fn satisfies_dep<S: AsRef<str>, V: AsRef<Ver>>(
-    dep: impl AsDep,
-    name: S,
-    version: V,
-) -> bool {
+pub fn satisfies_dep<S: AsRef<str>, V: AsRef<Ver>>(dep: impl AsDep, name: S, version: V) -> bool {
     let name = name.as_ref();
     let dep = dep.as_dep();
 
@@ -66,7 +62,7 @@ pub fn satisfies_provide_nover(dep: impl AsDep, provide: impl AsDep) -> bool {
     dep.as_dep().name() == provide.as_dep().name()
 }
 
-fn satisfies_ver<V: AsRef<Ver>>(dep: impl AsDep, version: V) -> bool {
+pub(crate) fn satisfies_ver<V: AsRef<Ver>>(dep: impl AsDep, version: V) -> bool {
     let version = version.as_ref();
     let dep = dep.as_dep();
 

alpm-utils/src/lib.rs

@@ -6,15 +6,20 @@
 
 #[cfg(feature = "conf")]
 mod conf;
+
 #[cfg(feature = "alpm")]
+mod alpm;
 mod db;
+
 /// Utils for dependency checking.
 #[cfg(feature = "alpm")]
 pub mod depends;
 mod target;
 
 #[cfg(feature = "conf")]
 pub use crate::conf::*;
+
 #[cfg(feature = "alpm")]
+pub use crate::alpm::*;
 pub use crate::db::*;
 pub use crate::target::*;