cleanup and apply suggested lint fixes

Author: wgurecky

src/convert.rs

@@ -99,8 +99,10 @@ impl<T: Element> IntoPyArray for faer::Mat<T> {
         let dims = Dim([self.nrows(), self.ncols()]);
         let rstride = self.row_stride();
         let cstride = self.col_stride();
-        // let strides = [mem::size_of::<T>() as npy_intp, mem::size_of::<T>() as npy_intp];
-        let strides = [rstride*mem::size_of::<T>() as npy_intp, cstride*mem::size_of::<T>() as npy_intp];
+        let strides = [
+            rstride * mem::size_of::<T>() as npy_intp,
+            cstride * mem::size_of::<T>() as npy_intp,
+        ];
         let data_ptr = self.as_ptr_mut();
         unsafe {
             PyArray::from_raw_parts(
@@ -114,7 +116,6 @@ impl<T: Element> IntoPyArray for faer::Mat<T> {
     }
 }
 
-
 impl<A, D> IntoPyArray for ArrayBase<OwnedRepr<A>, D>
 where
     A: Element,

src/slice_container.rs

@@ -1,4 +1,4 @@
-use std::{mem, ptr, slice::from_raw_parts_mut};
+use std::{mem, ptr};
 
 use ndarray::{ArrayBase, Dimension, OwnedRepr};
 use pyo3::pyclass;
@@ -74,17 +74,16 @@ impl<T: Send + Sync> From<Vec<T>> for PySliceContainer {
 #[cfg(feature = "faer")]
 impl<T: Send + Sync> From<faer::Mat<T>> for PySliceContainer {
     fn from(data: faer::Mat<T>) -> Self {
-        unsafe fn drop_faer_mat<T>(ptr: *mut u8, len: usize, _cap: usize) {
-            let _ = faer::mat::MatMut::from_raw_parts_mut(ptr as *mut T, len, 1, 1, 1);
+        unsafe fn drop_faer_mat<T>(ptr: *mut u8, len_nrows: usize, cap_ncols: usize) {
+            let _ = faer::mat::MatMut::from_raw_parts_mut(
+                ptr as *mut T, len_nrows, cap_ncols, 1, cap_ncols as isize);
         }
 
-        // FIXME(adamreichold): Use `Vec::into_raw_parts`
-        // when it becomes stable and compatible with our MSRV.
         let mut data = mem::ManuallyDrop::new(data);
 
         let ptr = data.as_ptr_mut() as *mut u8;
-        let len = data.nrows() * data.ncols();
-        let cap = 0;
+        let len = data.nrows();
+        let cap = data.ncols();
         let drop = drop_faer_mat::<T>;
 
         Self {

tests/to_py.rs

@@ -287,10 +287,11 @@ fn slice_container_type_confusion() {
         let _py_arr = vec![1, 2, 3].into_pyarray(py);
     });
 }
+
 #[cfg(feature = "faer")]
 #[test]
 fn faer_mat_to_numpy() {
-    let faer_mat: faer::Mat<f64> = faer::Scale(2.0)*faer::mat::Mat::<f64>::identity(2, 2);
+    let faer_mat: faer::Mat<f64> = faer::Scale(2.0) * faer::mat::Mat::<f64>::identity(2, 2);
     let faer_mat_wide: faer::Mat<f64> = faer::mat![[1.0, 2.0, 3.0], [4.0, 5.0, 6.0]];
     let faer_mat_tall: faer::Mat<f64> = faer_mat_wide.transpose().to_owned();
     Python::with_gil(|py| {
@@ -307,9 +308,7 @@ fn faer_mat_to_numpy() {
         );
         assert_eq!(
             mat_tall_pyarray.readonly().as_array(),
-            array![[1.0f64, 4.0],
-                   [2.0,    5.0],
-                   [3.0,    6.0]]
+            array![[1.0f64, 4.0], [2.0, 5.0], [3.0, 6.0]]
         );
     });
 }