Fix clippy warnings (#627)

rust-rocksdb · Apr 28, 2022 · 5a3ced8 · 5a3ced8
1 parent 3a46074
commit 5a3ced8
Show file tree

Hide file tree

Showing 7 changed files with 79 additions and 77 deletions.
diff --git a/librocksdb-sys/src/test.rs b/librocksdb-sys/src/test.rs
@@ -37,7 +37,7 @@ fn internal() {
 
         rocksdb_options_increase_parallelism(opts, 0);
         rocksdb_options_optimize_level_style_compaction(opts, 0);
-        rocksdb_options_set_create_if_missing(opts, true as c_uchar);
+        rocksdb_options_set_create_if_missing(opts, u8::from(true));
 
         let rustpath = "_rust_rocksdb_internaltest";
         let cpath = CString::new(rustpath).unwrap();

diff --git a/src/backup.rs b/src/backup.rs
@@ -15,7 +15,6 @@
 
 use crate::{ffi, Error, DB};
 
-use libc::{c_int, c_uchar};
 use std::ffi::CString;
 use std::path::Path;
 
@@ -93,7 +92,7 @@ impl BackupEngine {
             ffi_try!(ffi::rocksdb_backup_engine_create_new_backup_flush(
                 self.inner,
                 db.inner,
-                flush_before_backup as c_uchar,
+                u8::from(flush_before_backup),
             ));
             Ok(())
         }
@@ -268,7 +267,7 @@ impl BackupEngineOptions {
 impl RestoreOptions {
     pub fn set_keep_log_files(&mut self, keep_log_files: bool) {
         unsafe {
-            ffi::rocksdb_restore_options_set_keep_log_files(self.inner, keep_log_files as c_int);
+            ffi::rocksdb_restore_options_set_keep_log_files(self.inner, i32::from(keep_log_files));
         }
     }
 }

diff --git a/src/db.rs b/src/db.rs
@@ -26,7 +26,7 @@ use crate::{
     WriteBatch, WriteOptions, DEFAULT_COLUMN_FAMILY_NAME,
 };
 
-use libc::{self, c_char, c_int, c_uchar, c_void, size_t};
+use libc::{self, c_char, c_int, c_void, size_t};
 use std::collections::BTreeMap;
 use std::ffi::{CStr, CString};
 use std::fmt;
@@ -331,7 +331,7 @@ impl<T: ThreadMode> DBWithThreadMode<T> {
 
     /// Opens the database with a Time to Live compaction filter and column family names.
     ///
-    /// Column families opened using this function will be created with default `Options`.    
+    /// Column families opened using this function will be created with default `Options`.
     pub fn open_cf_with_ttl<P, I, N>(
         opts: &Options,
         path: P,
@@ -614,7 +614,7 @@ impl<T: ThreadMode> DBWithThreadMode<T> {
                 } => ffi_try!(ffi::rocksdb_open_for_read_only(
                     opts.inner,
                     cpath.as_ptr() as *const _,
-                    error_if_log_file_exist as c_uchar,
+                    u8::from(error_if_log_file_exist),
                 )),
                 AccessType::ReadWrite => {
                     ffi_try!(ffi::rocksdb_open(opts.inner, cpath.as_ptr() as *const _))
@@ -636,13 +636,14 @@ impl<T: ThreadMode> DBWithThreadMode<T> {
         Ok(db)
     }
 
+    #[allow(clippy::pedantic)]
     fn open_cf_raw(
         opts: &Options,
         cpath: &CString,
         cfs_v: &[ColumnFamilyDescriptor],
         cfnames: &[*const c_char],
         cfopts: &[*const ffi::rocksdb_options_t],
-        cfhandles: &mut Vec<*mut ffi::rocksdb_column_family_handle_t>,
+        cfhandles: &mut [*mut ffi::rocksdb_column_family_handle_t],
         access_type: &AccessType,
     ) -> Result<*mut ffi::rocksdb_t, Error> {
         let db = unsafe {
@@ -656,7 +657,7 @@ impl<T: ThreadMode> DBWithThreadMode<T> {
                     cfnames.as_ptr(),
                     cfopts.as_ptr(),
                     cfhandles.as_mut_ptr(),
-                    error_if_log_file_exist as c_uchar,
+                    u8::from(error_if_log_file_exist),
                 )),
                 AccessType::ReadWrite => ffi_try!(ffi::rocksdb_open_column_families(
                     opts.inner,
@@ -737,7 +738,7 @@ impl<T: ThreadMode> DBWithThreadMode<T> {
     /// the data to disk.
     pub fn flush_wal(&self, sync: bool) -> Result<(), Error> {
         unsafe {
-            ffi_try!(ffi::rocksdb_flush_wal(self.inner, sync as u8));
+            ffi_try!(ffi::rocksdb_flush_wal(self.inner, u8::from(sync)));
         }
         Ok(())
     }
@@ -1891,7 +1892,7 @@ impl<T: ThreadMode> DBWithThreadMode<T> {
     /// Request stopping background work, if wait is true wait until it's done.
     pub fn cancel_all_background_work(&self, wait: bool) {
         unsafe {
-            ffi::rocksdb_cancel_all_background_work(self.inner, wait as u8);
+            ffi::rocksdb_cancel_all_background_work(self.inner, u8::from(wait));
         }
     }