fixed clippy warnings (#268)

Author: TyberiusPrime

src/bam/mod.rs

@@ -36,7 +36,7 @@ use std::convert::TryInto;
 /// # Safety
 ///
 /// Implementation for `Read::set_threads` and `Writer::set_threads`.
-pub unsafe fn set_threads(htsfile: *mut htslib::htsFile, n_threads: usize) -> Result<()> {
+unsafe fn set_threads(htsfile: *mut htslib::htsFile, n_threads: usize) -> Result<()> {
     assert!(n_threads != 0, "n_threads must be > 0");
 
     if htslib::hts_set_threads(htsfile, n_threads as i32) != 0 {
@@ -46,7 +46,7 @@ pub unsafe fn set_threads(htsfile: *mut htslib::htsFile, n_threads: usize) -> Re
     }
 }
 
-pub unsafe fn set_thread_pool(htsfile: *mut htslib::htsFile, tpool: &ThreadPool) -> Result<()> {
+unsafe fn set_thread_pool(htsfile: *mut htslib::htsFile, tpool: &ThreadPool) -> Result<()> {
     let mut b = tpool.handle.borrow_mut();
 
     if htslib::hts_set_thread_pool(htsfile, &mut b.inner as *mut _) != 0 {

src/bcf/buffer.rs

@@ -3,6 +3,7 @@
 // This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use std::cmp::Ordering;
 use std::collections::{vec_deque, VecDeque};
 use std::mem;
 
@@ -131,26 +132,30 @@ impl RecordBuffer {
             }
             let pos = rec.pos() as u64;
             if let Some(rec_rid) = rec.rid() {
-                if rec_rid == rid {
-                    if pos >= end {
-                        // Record is beyond our window. Store it anyways but stop.
-                        self.overflow = Some(rec);
+                match rec_rid.cmp(&rid) {
+                    Ordering::Equal => {
+                        if pos >= end {
+                            // Record is beyond our window. Store it anyways but stop.
+                            self.overflow = Some(rec);
+                            break;
+                        } else if pos >= start {
+                            // Record is within our window.
+                            self.ringbuffer.push_back(rec);
+                            added += 1;
+                        } else {
+                            // Record is upstream of our window, ignore it
+                            continue;
+                        }
+                    }
+                    Ordering::Greater => {
+                        // record comes from next rid. Store it in second buffer but stop filling.
+                        self.ringbuffer2.push_back(rec);
                         break;
-                    } else if pos >= start {
-                        // Record is within our window.
-                        self.ringbuffer.push_back(rec);
-                        added += 1;
-                    } else {
-                        // Record is upstream of our window, ignore it
+                    }
+                    _ => {
+                        // Record comes from previous rid. Ignore it.
                         continue;
                     }
-                } else if rec_rid > rid {
-                    // record comes from next rid. Store it in second buffer but stop filling.
-                    self.ringbuffer2.push_back(rec);
-                    break;
-                } else {
-                    // Record comes from previous rid. Ignore it.
-                    continue;
                 }
             } else {
                 // skip records without proper rid

src/lib.rs

@@ -25,15 +25,14 @@
 //! ```
 //! use rust_htslib::{bam, bam::Read};
 //!
-//! fn main() {
-//!     let bam = bam::Reader::from_path(&"test/test.bam").unwrap();
-//!     let header = bam::Header::from_template(bam.header());
-//!
-//!     // print header records to the terminal, akin to samtool
-//!     for (key, records) in header.to_hashmap() {
-//!         for record in records {
-//!             println!("@{}\tSN:{}\tLN:{}", key, record["SN"], record["LN"]);
-//!         }
+//!
+//! let bam = bam::Reader::from_path(&"test/test.bam").unwrap();
+//! let header = bam::Header::from_template(bam.header());
+//!
+//! // print header records to the terminal, akin to samtool
+//! for (key, records) in header.to_hashmap() {
+//!     for record in records {
+//!          println!("@{}\tSN:{}\tLN:{}", key, record["SN"], record["LN"]);
 //!     }
 //! }
 //! ```

src/tpool.rs

@@ -44,7 +44,7 @@ pub struct InnerThreadPool {
 
 impl Drop for InnerThreadPool {
     fn drop(&mut self) {
-        if self.inner.pool != std::ptr::null_mut() {
+        if !self.inner.pool.is_null() {
             unsafe {
                 htslib::hts_tpool_destroy(self.inner.pool);
             }