Add clippy linter in CI (rust-rocksdb#417)

Author: Oleksandr Anyshchenko

.travis.yml

@@ -4,20 +4,16 @@ dist: bionic
 os:
 - linux
 - osx
-- windows
 
 rust:
   - stable
 
-jobs:
-  allow_failures:
-    - os: windows
-
 install:
   - rustup component add rustfmt
   - rustfmt -V
+  - rustup component add clippy
+  - cargo clippy --version
 
 script:
-  - cargo fmt --all -- --check
-  - cargo test --manifest-path=librocksdb-sys/Cargo.toml
-  - cargo test -- --skip test_iterator_outlive_db
+  - .travis/lints.sh
+  - .travis/tests.sh

.travis/lints.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# Run cargo fmt and cargo clippy only on OSX host
+
+if [[ ${TRAVIS_OS_NAME} == "osx" ]]; then
+    cargo fmt --all -- --check
+    cargo clippy --all --tests -- -D warnings
+fi

.travis/tests.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cargo test --manifest-path=librocksdb-sys/Cargo.toml
+cargo test -- --skip test_iterator_outlive_db

LICENSE

@@ -187,11 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2014 Tyler Neely
-   Copyright 2015 Tyler Neely
-   Copyright 2016 Tyler Neely
-   Copyright 2017 Tyler Neely
-   Copyright 2018 Tyler Neely
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

librocksdb-sys/build.rs

@@ -183,12 +183,12 @@ fn build_rocksdb() {
 fn build_snappy() {
     let target = env::var("TARGET").unwrap();
     let endianness = env::var("CARGO_CFG_TARGET_ENDIAN").unwrap();
-
     let mut config = cc::Build::new();
+
     config.include("snappy/");
     config.include(".");
-
     config.define("NDEBUG", Some("1"));
+    config.extra_warnings(false);
 
     if target.contains("msvc") {
         config.flag("-EHsc");
@@ -250,6 +250,7 @@ fn build_zstd() {
     }
 
     compiler.opt_level(3);
+    compiler.extra_warnings(false);
 
     compiler.define("ZSTD_LIB_DEPRECATED", Some("0"));
     compiler.compile("libzstd.a");
@@ -269,6 +270,7 @@ fn build_zlib() {
 
     compiler.flag_if_supported("-Wno-implicit-function-declaration");
     compiler.opt_level(3);
+    compiler.extra_warnings(false);
     compiler.compile("libz.a");
 }
 
@@ -290,6 +292,7 @@ fn build_bzip2() {
 
     compiler.extra_warnings(false);
     compiler.opt_level(3);
+    compiler.extra_warnings(false);
     compiler.compile("libbz2.a");
 }
 

librocksdb-sys/src/lib.rs

@@ -1,4 +1,4 @@
-// Copyright 2019 Tyler Neely, Alex Regueiro
+// Copyright 2020 Tyler Neely, Alex Regueiro
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#![allow(clippy::all)]
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
 #![allow(non_upper_case_globals)]

librocksdb-sys/src/test.rs

@@ -1,4 +1,4 @@
-// Copyright 2019 Tyler Neely
+// Copyright 2020 Tyler Neely
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

src/backup.rs

@@ -38,15 +38,14 @@ impl BackupEngine {
         path: P,
     ) -> Result<BackupEngine, Error> {
         let path = path.as_ref();
-        let cpath = match CString::new(path.to_string_lossy().as_bytes()) {
-            Ok(c) => c,
-            Err(_) => {
-                return Err(Error::new(
-                    "Failed to convert path to CString \
+        let cpath = if let Ok(e) = CString::new(path.to_string_lossy().as_bytes()) {
+            e
+        } else {
+            return Err(Error::new(
+                "Failed to convert path to CString \
                      when opening backup engine"
-                        .to_owned(),
-                ));
-            }
+                    .to_owned(),
+            ));
         };
 
         let be: *mut ffi::rocksdb_backup_engine_t;
@@ -107,27 +106,25 @@ impl BackupEngine {
         opts: &RestoreOptions,
     ) -> Result<(), Error> {
         let db_dir = db_dir.as_ref();
-        let c_db_dir = match CString::new(db_dir.to_string_lossy().as_bytes()) {
-            Ok(c) => c,
-            Err(_) => {
-                return Err(Error::new(
-                    "Failed to convert db_dir to CString \
+        let c_db_dir = if let Ok(c) = CString::new(db_dir.to_string_lossy().as_bytes()) {
+            c
+        } else {
+            return Err(Error::new(
+                "Failed to convert db_dir to CString \
                      when restoring from latest backup"
-                        .to_owned(),
-                ));
-            }
+                    .to_owned(),
+            ));
         };
 
         let wal_dir = wal_dir.as_ref();
-        let c_wal_dir = match CString::new(wal_dir.to_string_lossy().as_bytes()) {
-            Ok(c) => c,
-            Err(_) => {
-                return Err(Error::new(
-                    "Failed to convert wal_dir to CString \
+        let c_wal_dir = if let Ok(c) = CString::new(wal_dir.to_string_lossy().as_bytes()) {
+            c
+        } else {
+            return Err(Error::new(
+                "Failed to convert wal_dir to CString \
                      when restoring from latest backup"
-                        .to_owned(),
-                ));
-            }
+                    .to_owned(),
+            ));
         };
 
         unsafe {

src/checkpoint.rs

@@ -50,13 +50,12 @@ impl Checkpoint {
     /// Creates new physical DB checkpoint in directory specified by `path`.
     pub fn create_checkpoint<P: AsRef<Path>>(&self, path: P) -> Result<(), Error> {
         let path = path.as_ref();
-        let cpath = match CString::new(path.to_string_lossy().as_bytes()) {
-            Ok(c) => c,
-            Err(_) => {
-                return Err(Error::new(
-                    "Failed to convert path to CString when creating DB checkpoint".to_owned(),
-                ));
-            }
+        let cpath = if let Ok(c) = CString::new(path.to_string_lossy().as_bytes()) {
+            c
+        } else {
+            return Err(Error::new(
+                "Failed to convert path to CString when creating DB checkpoint".to_owned(),
+            ));
         };
 
         unsafe {

src/compaction_filter.rs

@@ -1,4 +1,4 @@
-// Copyright 2016 Tyler Neely
+// Copyright 2020 Tyler Neely
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -41,12 +41,7 @@ pub enum Decision {
 ///
 ///  [set_compaction_filter]: ../struct.Options.html#method.set_compaction_filter
 pub trait CompactionFilterFn: FnMut(u32, &[u8], &[u8]) -> Decision {}
-impl<F> CompactionFilterFn for F
-where
-    F: FnMut(u32, &[u8], &[u8]) -> Decision,
-    F: Send + 'static,
-{
-}
+impl<F> CompactionFilterFn for F where F: FnMut(u32, &[u8], &[u8]) -> Decision + Send + 'static {}
 
 pub struct CompactionFilterCallback<F>
 where
@@ -85,7 +80,7 @@ pub unsafe extern "C" fn filter_callback<F>(
 where
     F: CompactionFilterFn,
 {
-    use self::Decision::*;
+    use self::Decision::{Change, Keep, Remove};
 
     let cb = &mut *(raw_cb as *mut CompactionFilterCallback<F>);
     let key = slice::from_raw_parts(raw_key as *const u8, key_length as usize);
@@ -106,7 +101,7 @@ where
 #[cfg(test)]
 #[allow(unused_variables)]
 fn test_filter(level: u32, key: &[u8], value: &[u8]) -> Decision {
-    use self::Decision::*;
+    use self::Decision::{Change, Keep, Remove};
     match key.first() {
         Some(&b'_') => Remove,
         Some(&b'%') => Change(b"secret"),

src/comparator.rs

@@ -1,4 +1,4 @@
-// Copyright 2014 Tyler Neely
+// Copyright 2020 Tyler Neely
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.