Revert changes to alpm list

While this technically makes things more generic, it breaks existing
code. Wait for v3 for a better rework.

Author: Morganamilo

alpm/src/deps.rs

@@ -1,5 +1,5 @@
 use crate::utils::*;
-use crate::{free, Alpm, AlpmList, AlpmListMut, Db, IntoRawAlpmList, Package, Pkg, Ver};
+use crate::{free, Alpm, AlpmList, AlpmListMut, Db, IntoRawAlpmList, Package, Ver};
 
 use alpm_sys::alpm_depmod_t::*;
 use alpm_sys::*;
@@ -343,9 +343,9 @@ impl<'a> AlpmList<'a, Package<'a>> {
 impl Alpm {
     pub fn check_deps<'a>(
         &self,
-        pkgs: impl IntoRawAlpmList<'a, Pkg<'a>>,
-        rem: impl IntoRawAlpmList<'a, Pkg<'a>>,
-        upgrade: impl IntoRawAlpmList<'a, Pkg<'a>>,
+        pkgs: impl IntoRawAlpmList<'a, Package<'a>>,
+        rem: impl IntoRawAlpmList<'a, Package<'a>>,
+        upgrade: impl IntoRawAlpmList<'a, Package<'a>>,
         reverse_deps: bool,
     ) -> AlpmListMut<DependMissing> {
         let reverse_deps = if reverse_deps { 1 } else { 0 };

alpm/src/list.rs

@@ -93,6 +93,28 @@ where
     unsafe fn into_raw_alpm_list(self) -> RawAlpmList<'a, T, Self::Drop>;
 }
 
+impl<'a> IntoRawAlpmList<'a, Pkg<'a>> for AlpmList<'a, LoadedPackage<'a>> {
+    type Drop = False;
+    unsafe fn into_raw_alpm_list(self) -> RawAlpmList<'a, Pkg<'a>, Self::Drop> {
+        RawAlpmList {
+            list: self.list,
+            _marker1: PhantomData,
+            _marker2: PhantomData,
+        }
+    }
+}
+
+impl<'a> IntoRawAlpmList<'a, Pkg<'a>> for AlpmList<'a, Package<'a>> {
+    type Drop = False;
+    unsafe fn into_raw_alpm_list(self) -> RawAlpmList<'a, Pkg<'a>, Self::Drop> {
+        RawAlpmList {
+            list: self.list,
+            _marker1: PhantomData,
+            _marker2: PhantomData,
+        }
+    }
+}
+
 impl<'a, T> IntoRawAlpmList<'a, T> for AlpmList<'a, T>
 where
     T: AsAlpmListItemPtr<'a>,
@@ -643,7 +665,7 @@ unsafe impl<'a> AsAlpmListItemPtr<'a> for Pkg<'a> {
 }
 
 unsafe impl<'a> AsAlpmListItemPtr<'a> for Package<'a> {
-    type Output = Pkg<'a>;
+    type Output = Package<'a>;
 
     fn as_ptr(&self) -> *mut c_void {
         self.pkg.as_ptr() as *mut c_void
@@ -715,34 +737,12 @@ unsafe impl<'a> Push<'a> for Depend {}
 unsafe impl<'a> Push<'a> for Dep<'a> {}
 
 unsafe impl<'a, 'b> IntoAlpmListItem<'a, 'b> for Package<'a> {
-    type Borrow = Pkg<'a>;
-    unsafe fn ptr_into_alpm_list_item(handle: &'a Alpm, ptr: *mut c_void) -> Self {
-        Package::new(handle, ptr as *mut alpm_pkg_t)
-    }
-    unsafe fn ptr_as_alpm_list_item(handle: &'a Alpm, ptr: *mut c_void) -> Self::Borrow {
-        Package::new(handle, ptr as *mut alpm_pkg_t).pkg
-    }
-}
-
-unsafe impl<'a, 'b> IntoAlpmListItem<'a, 'b> for Pkg<'a> {
     type Borrow = Self;
     unsafe fn ptr_into_alpm_list_item(handle: &'a Alpm, ptr: *mut c_void) -> Self {
-        Package::new(handle, ptr as *mut alpm_pkg_t).pkg
-    }
-    unsafe fn ptr_as_alpm_list_item(handle: &'a Alpm, ptr: *mut c_void) -> Self::Borrow {
-        Package::new(handle, ptr as *mut alpm_pkg_t).pkg
-    }
-}
-
-unsafe impl<'a, 'b> IntoAlpmListItem<'a, 'b> for LoadedPackage<'a> {
-    type Borrow = Pkg<'a>;
-    unsafe fn ptr_into_alpm_list_item(handle: &'a Alpm, ptr: *mut c_void) -> Self {
-        LoadedPackage {
-            pkg: Package::new(handle, ptr as *mut alpm_pkg_t).pkg,
-        }
+        Package::new(handle, ptr as *mut alpm_pkg_t)
     }
     unsafe fn ptr_as_alpm_list_item(handle: &'a Alpm, ptr: *mut c_void) -> Self::Borrow {
-        Package::new(handle, ptr as *mut alpm_pkg_t).pkg
+        Package::new(handle, ptr as *mut alpm_pkg_t)
     }
 }