Mercurial > lbo > hg > leveldb-rs
changeset 308:f13752b9daf8
db_impl/disk_env/mem_env: Fix compiler warnings.
| author | Lewin Bormann <lbo@spheniscida.de> |
|---|---|
| date | Wed, 27 Sep 2017 20:45:49 +0200 |
| parents | 443bf10ac7a5 |
| children | 9a2f35bb13d6 |
| files | src/db_impl.rs src/disk_env.rs src/mem_env.rs |
| diffstat | 3 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/db_impl.rs Wed Sep 27 20:39:27 2017 +0200 +++ b/src/db_impl.rs Wed Sep 27 20:45:49 2017 +0200 @@ -882,7 +882,7 @@ { let mut opt = opt.clone(); opt.reuse_manifest = false; - let db = DB::open("otherdb", opt.clone()).unwrap(); + let _ = DB::open("otherdb", opt.clone()).unwrap(); println!("children after: {:?}", env.children(Path::new("otherdb/")).unwrap()); @@ -968,6 +968,7 @@ } } + #[allow(unused_variables)] #[test] fn test_db_impl_locking() { let opt = options::for_test();
--- a/src/disk_env.rs Wed Sep 27 20:39:27 2017 +0200 +++ b/src/disk_env.rs Wed Sep 27 20:45:49 2017 +0200 @@ -128,7 +128,8 @@ let mut locks = self.locks.lock().unwrap(); if !locks.contains_key(&l.id) { - return err(StatusCode::LockError, "unlocking a file that is not locked!"); + return err(StatusCode::LockError, + "unlocking a file that is not locked!"); } else { let fd = locks.remove(&l.id).unwrap(); let flock_arg = libc::flock { @@ -214,7 +215,7 @@ { let r = env.lock(name); assert!(r.is_ok()); - env.unlock(r.unwrap()); + env.unlock(r.unwrap()).unwrap(); } { @@ -222,7 +223,7 @@ assert!(r.is_ok()); let s = env.lock(name); assert!(s.is_err()); - env.unlock(r.unwrap()); + env.unlock(r.unwrap()).unwrap(); } assert!(env.delete(name).is_ok());
--- a/src/mem_env.rs Wed Sep 27 20:39:27 2017 +0200 +++ b/src/mem_env.rs Wed Sep 27 20:45:49 2017 +0200 @@ -545,7 +545,7 @@ assert!(!me.exists(p1).unwrap()); assert!(me.rename(nonexist, p1).is_err()); - me.unlock(me.lock(p3).unwrap()); + me.unlock(me.lock(p3).unwrap()).unwrap(); assert!(me.lock(nonexist).is_ok()); me.new_logger(p1).unwrap();