Merge pull request #29 from WhyNotHugo/cleanups

Cleanups

Author: Morganamilo

alpm-utils/src/depends.rs

@@ -1,7 +1,7 @@
 use alpm::{AsDep, DepModVer, Ver};
 
 /// Checks if a dependency is satisfied by a package (name + version).
-pub fn satisfies_dep<'a, S: AsRef<str>, V: AsRef<Ver>>(
+pub fn satisfies_dep<S: AsRef<str>, V: AsRef<Ver>>(
     dep: impl AsDep,
     name: S,
     version: V,
@@ -36,7 +36,7 @@ pub fn satisfies_provide(dep: impl AsDep, provide: impl AsDep) -> bool {
 }
 
 /// Checks if a Dep is satisfied by a name + version + provides combo
-pub fn satisfies<'a, D: AsDep, S: AsRef<str>, V: AsRef<Ver>>(
+pub fn satisfies<D: AsDep, S: AsRef<str>, V: AsRef<Ver>>(
     dep: impl AsDep,
     name: S,
     version: V,
@@ -47,7 +47,7 @@ pub fn satisfies<'a, D: AsDep, S: AsRef<str>, V: AsRef<Ver>>(
 }
 
 /// Checks if a Dep is satisfied by a name + provides (ignoring version) combo
-pub fn satisfies_nover<'a, D: AsDep, S: AsRef<str>>(
+pub fn satisfies_nover<D: AsDep, S: AsRef<str>>(
     dep: impl AsDep,
     name: S,
     mut provides: impl Iterator<Item = D>,
@@ -57,7 +57,7 @@ pub fn satisfies_nover<'a, D: AsDep, S: AsRef<str>>(
 }
 
 /// Checks if a dependency is satisfied by a package (name only).
-pub fn satisfies_dep_nover<'a, S: AsRef<str>>(dep: impl AsDep, name: S) -> bool {
+pub fn satisfies_dep_nover<S: AsRef<str>>(dep: impl AsDep, name: S) -> bool {
     dep.as_dep().name() == name.as_ref()
 }
 

alpm-utils/src/target.rs

@@ -10,7 +10,7 @@ impl<T> AsTarg for T
 where
     T: AsRef<str>,
 {
-    fn as_targ<'a>(&'a self) -> Targ<'a> {
+    fn as_targ(&self) -> Targ {
         Targ::from(self.as_ref())
     }
 }

alpm/examples/callbacks.rs

@@ -44,4 +44,6 @@ fn main() {
     handle
         .register_syncdb("community", SigLevel::USE_DEFAULT)
         .unwrap();
+
+    println!("final value of number was: {}", number.borrow())
 }

alpm/src/types.rs

@@ -989,7 +989,7 @@ impl<'a> fmt::Debug for Group<'a> {
 }
 
 impl<'a> Group<'a> {
-    pub(crate) unsafe fn new<'b>(handle: &'b Alpm, ptr: *mut alpm_group_t) -> Group<'b> {
+    pub(crate) unsafe fn new(handle: &Alpm, ptr: *mut alpm_group_t) -> Group {
         Group {
             handle,
             inner: NonNull::new_unchecked(ptr),
@@ -1042,7 +1042,7 @@ impl<'a> Read for ChangeLog<'a> {
 }
 
 impl<'a> ChangeLog<'a> {
-    pub(crate) unsafe fn new<'b>(pkg: Pkg<'b>, ptr: *mut c_void) -> ChangeLog<'b> {
+    pub(crate) unsafe fn new(pkg: Pkg, ptr: *mut c_void) -> ChangeLog {
         ChangeLog {
             pkg,
             stream: NonNull::new_unchecked(ptr),