Some clippy fixes

Author: aseyboldt

src/cpu_sampler.rs

@@ -1,4 +1,4 @@
-use rand::{prelude::StdRng, Rng, SeedableRng};
+use rand::{Rng, SeedableRng};
 use rayon::prelude::*;
 use std::thread::JoinHandle;
 use thiserror::Error;
@@ -124,7 +124,7 @@ pub fn sample_parallel<
 
             let mut error = None;
             for _ in 0..n_try_init {
-                match func.logp(&mut position, &mut grad) {
+                match func.logp(&position, &mut grad) {
                     Err(e) => error = Some(e),
                     Ok(_) => {
                         error = None;
@@ -218,7 +218,7 @@ pub fn sample_sequentially<F: CpuLogpFunc, R: Rng + ?Sized>(
 ) -> Result<impl Iterator<Item = Result<(Box<[f64]>, impl SampleStats), NutsError>>, NutsError> {
     let mut sampler = new_sampler(logp, settings, chain, rng);
     sampler.set_position(start)?;
-    Ok((0..draws).into_iter().map(move |_| sampler.draw()))
+    Ok((0..draws).map(move |_| sampler.draw()))
 }
 
 /// Initialize chains using uniform jitter around zero or some other provided value
@@ -264,9 +264,7 @@ pub mod test_logps {
     }
 
     impl CpuLogpFuncMaker<NormalLogp> for NormalLogp {
-        //type Func = Self;
-
-        fn make_logp_func(&self, chain: usize) -> Result<NormalLogp, anyhow::Error> {
+        fn make_logp_func(&self, _chain: usize) -> Result<NormalLogp, anyhow::Error> {
             Ok(self.clone())
         }
 
@@ -397,7 +395,7 @@ mod tests {
         assert!(handles.join().is_ok());
 
         let draw0 = draws.remove(100);
-        let (vals, stats) = draw0;
+        let (vals, _) = draw0;
         assert_eq!(vals.len(), 10);
     }
 }

src/cpu_state.rs

@@ -119,7 +119,7 @@ impl Drop for AlignedArray {
 impl Clone for AlignedArray {
     fn clone(&self) -> Self {
         let mut new = AlignedArray::new(self.size);
-        new.copy_from_slice(&self);
+        new.copy_from_slice(self);
         new
     }
 }
@@ -214,9 +214,9 @@ impl crate::nuts::State for State {
 
     fn is_turning(&self, other: &Self) -> bool {
         let (start, end) = if self.idx_in_trajectory < other.idx_in_trajectory {
-            (&*self, other)
+            (self, other)
         } else {
-            (other, &*self)
+            (other, self)
         };
 
         let a = start.idx_in_trajectory;

src/lib.rs

@@ -14,6 +14,7 @@
 //! ```
 //! use nuts_rs::{CpuLogpFunc, LogpError, new_sampler, SamplerArgs, Chain, SampleStats};
 //! use thiserror::Error;
+//! use rand::thread_rng;
 //!
 //! // Define a function that computes the unnormalized posterior density
 //! // and its gradient.
@@ -60,8 +61,8 @@
 //! let logp_func = PosteriorDensity {};
 //!
 //! let chain = 0;
-//! let seed = 42;
-//! let mut sampler = new_sampler(logp_func, sampler_args, chain, seed);
+//! let mut rng = thread_rng();
+//! let mut sampler = new_sampler(logp_func, sampler_args, chain, &mut rng);
 //!
 //! // Set to some initial position and start drawing samples.
 //! sampler.set_position(&vec![0f64; 10]).expect("Unrecoverable error during init");
@@ -108,5 +109,5 @@ pub use cpu_sampler::{
     JitterInitFunc, ParallelChainResult, ParallelSamplingError, SamplerArgs,
 };
 #[cfg(feature = "arrow")]
-pub use nuts::ArrowBuilder;
+pub use nuts::{ArrowBuilder, ArrowRow};
 pub use nuts::{Chain, DivergenceInfo, LogpError, NutsError, SampleStats};

src/nuts.rs

@@ -238,7 +238,6 @@ impl<P: Hamiltonian, C: Collector<State = P::State>> NutsTree<P, C> {
         rng: &mut R,
         potential: &mut P,
         direction: Direction,
-        options: &NutsOptions,
         collector: &mut C,
     ) -> ExtendResult<P, C>
     where
@@ -253,7 +252,7 @@ impl<P: Hamiltonian, C: Collector<State = P::State>> NutsTree<P, C> {
 
         while other.depth < self.depth {
             use ExtendResult::*;
-            other = match other.extend(pool, rng, potential, direction, options, collector) {
+            other = match other.extend(pool, rng, potential, direction, collector) {
                 Ok(tree) => tree,
                 Turning(_) => {
                     return Turning(self);
@@ -358,13 +357,9 @@ impl<P: Hamiltonian, C: Collector<State = P::State>> NutsTree<P, C> {
     }
 
     fn info(&self, maxdepth: bool, divergence_info: Option<DivergenceInfo>) -> SampleInfo {
-        let info: Option<DivergenceInfo> = match divergence_info {
-            Some(info) => Some(info),
-            None => None,
-        };
         SampleInfo {
             depth: self.depth,
-            divergence_info: info,
+            divergence_info,
             reached_maxdepth: maxdepth,
         }
     }
@@ -395,7 +390,7 @@ where
     let mut tree = NutsTree::new(init.clone());
     while tree.depth < options.maxdepth {
         let direction: Direction = rng.gen();
-        tree = match tree.extend(pool, rng, potential, direction, options, collector) {
+        tree = match tree.extend(pool, rng, potential, direction, collector) {
             ExtendResult::Ok(tree) => tree,
             ExtendResult::Turning(tree) => {
                 let info = tree.info(false, None);
@@ -769,6 +764,8 @@ where
 #[cfg(test)]
 #[cfg(feature = "arrow")]
 mod tests {
+    use rand::thread_rng;
+
     use crate::{adapt_strategy::test_logps::NormalLogp, new_sampler, Chain, SamplerArgs};
 
     use super::ArrowBuilder;
@@ -779,8 +776,9 @@ mod tests {
         let func = NormalLogp::new(ndim, 3.);
 
         let settings = SamplerArgs::default();
+        let mut rng = thread_rng();
 
-        let mut chain = new_sampler(func, settings, 0, 0);
+        let mut chain = new_sampler(func, settings, 0, &mut rng);
 
         let mut builder = chain.stats_builder(ndim, &settings);