make code more rusty (#41)

src/lib.rs

@@ -24,9 +24,9 @@ pub mod rocksdb_options;
 pub mod merge_operator;
 pub mod comparator;
 
-pub use librocksdb_sys::{DBCompactionStyle, DBComparator, DBCompressionType,
+pub use librocksdb_sys::{DBCompactionStyle, DBCompressionType,
                          DBRecoveryMode, new_bloom_filter, self as rocksdb_ffi};
 pub use merge_operator::MergeOperands;
-pub use rocksdb::{DB, DBIterator, DBVector, Kv, SeekKey, Writable, WriteBatch};
+pub use rocksdb::{DB, DBIterator, DBVector, Kv, SeekKey, Writable, WriteBatch, CFHandle};
 pub use rocksdb_options::{BlockBasedOptions, Options, ReadOptions,
                           WriteOptions};

src/main.rs

@@ -143,7 +143,7 @@ fn main() {
 
 #[cfg(test)]
 mod tests {
-    use rocksdb::{BlockBasedOptions, DB, DBCompressionType, Options, ReadOptions, WriteOptions, SeekKey};
+    use rocksdb::{BlockBasedOptions, DB, DBCompressionType, Options};
     use rocksdb::DBCompactionStyle::DBUniversal;
     use rocksdb::DBRecoveryMode;
 

src/rocksdb_options.rs

@@ -20,7 +20,7 @@ use merge_operator::{self, MergeOperatorCallback, full_merge_callback,
 use merge_operator::MergeFn;
 
 use rocksdb_ffi::{self, DBOptions, DBWriteOptions, DBBlockBasedTableOptions,
-                  DBReadOptions, DBCompressionType, DBRecoveryMode};
+                  DBReadOptions, DBCompressionType, DBRecoveryMode, DBSnapshot, DBInstance};
 use std::ffi::CString;
 use std::mem;
 
@@ -97,15 +97,15 @@ impl BlockBasedOptions {
 /// This object is convenient for wrapping snapshot by yourself. In most
 /// cases, using `Snapshot` is enough.
 pub struct UnsafeSnap {
-    inner: rocksdb_ffi::DBSnapshot,
+    inner: *const DBSnapshot,
 }
 
 impl UnsafeSnap {
-    pub unsafe fn new(db: rocksdb_ffi::DBInstance) -> UnsafeSnap {
+    pub unsafe fn new(db: *mut DBInstance) -> UnsafeSnap {
         UnsafeSnap { inner: rocksdb_ffi::rocksdb_create_snapshot(db) }
     }
 
-    pub unsafe fn get_inner(&self) -> rocksdb_ffi::DBSnapshot {
+    pub unsafe fn get_inner(&self) -> *const DBSnapshot {
         self.inner
     }
 }

test/test_column_family.rs

@@ -73,7 +73,7 @@ pub fn test_column_family() {
             }
             Err(e) => panic!("failed to open db with column family: {}", e),
         };
-        let cf1 = *db.cf_handle("cf1").unwrap();
+        let cf1 = db.cf_handle("cf1").unwrap();
         assert!(db.put_cf(cf1, b"k1", b"v1").is_ok());
         assert!(db.get_cf(cf1, b"k1").unwrap().unwrap().to_utf8().unwrap() ==
                 "v1");