Mercurial > lbo > hg > leveldb-rs
changeset 467:aececedd5ad1
chore(warnings): Fix syntax warnings about unused results.
author | Lewin Bormann <lbo@spheniscida.de> |
---|---|
date | Sun, 26 May 2019 22:20:48 +0200 |
parents | 29d2b936b2f0 |
children | 012b8d60b37d |
files | src/db_impl.rs src/mem_env.rs src/version_set.rs |
diffstat | 3 files changed, 12 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/src/db_impl.rs Mon Apr 23 22:53:47 2018 +0200 +++ b/src/db_impl.rs Sun May 26 22:20:48 2019 +0200 @@ -151,7 +151,7 @@ return err(StatusCode::AlreadyExists, "database already exists"); } - self.opt.env.mkdir(Path::new(&self.name)).is_ok(); + let _ = self.opt.env.mkdir(Path::new(&self.name)); self.acquire_lock()?; if let Err(e) = read_current_file(&self.opt.env, &self.name) { @@ -321,7 +321,7 @@ // If we're here, delete this file. if typ == FileType::Table { - self.cache.borrow_mut().evict(num).is_ok(); + let _ = self.cache.borrow_mut().evict(num); } log!(self.opt.log, "Deleting file type={:?} num={}", typ, num); if let Err(e) = self.opt.env.delete(&self.name.join(&name)) { @@ -731,10 +731,9 @@ num, e ); - self.opt + let _ = self.opt .env - .delete(Path::new(&table_file_name(&self.name, num))) - .is_ok(); + .delete(Path::new(&table_file_name(&self.name, num))); return Err(e); } @@ -928,7 +927,7 @@ impl Drop for DB { fn drop(&mut self) { - self.release_lock().is_ok(); + let _ = self.release_lock(); } } @@ -960,7 +959,7 @@ fn cleanup<P: AsRef<Path>>(&mut self, env: &Box<Env>, name: P) { for o in self.outputs.drain(..) { let name = table_file_name(name.as_ref(), o.num); - env.delete(&name).is_ok(); + let _ = env.delete(&name); } } } @@ -1012,13 +1011,13 @@ })(); if let Err(e) = r { - opt.env.delete(Path::new(&filename)).is_ok(); + let _ = opt.env.delete(Path::new(&filename)); return Err(e); } let mut md = FileMetaData::default(); if firstkey.is_none() { - opt.env.delete(Path::new(&filename)).is_ok(); + let _ = opt.env.delete(Path::new(&filename)); } else { md.num = num; md.size = opt.env.size_of(Path::new(&filename))?; @@ -1042,11 +1041,10 @@ let db = db.as_ref(); let logfilename = db.join("LOG"); let oldlogfilename = db.join("LOG.old"); - env.mkdir(Path::new(db)).is_ok(); + let _ = env.mkdir(Path::new(db)); if let Ok(e) = env.exists(Path::new(&logfilename)) { if e { - env.rename(Path::new(&logfilename), Path::new(&oldlogfilename)) - .is_ok(); + let _ = env.rename(Path::new(&logfilename), Path::new(&oldlogfilename)); } } if let Ok(w) = env.open_writable_file(Path::new(&logfilename)) {
--- a/src/mem_env.rs Mon Apr 23 22:53:47 2018 +0200 +++ b/src/mem_env.rs Sun May 26 22:20:48 2019 +0200 @@ -178,7 +178,7 @@ let mut children = Vec::new(); for k in fs.keys() { if k.starts_with(&prefix) { - children.push(Path::new(k.trim_left_matches(&prefix)).to_owned()); + children.push(Path::new(k.trim_start_matches(&prefix)).to_owned()); } } Ok(children)
--- a/src/version_set.rs Mon Apr 23 22:53:47 2018 +0200 +++ b/src/version_set.rs Sun May 26 22:20:48 2019 +0200 @@ -886,7 +886,7 @@ let currentfile = current_file_name(dbname); if let Err(e) = env.rename(Path::new(&tempfile), Path::new(¤tfile)) { // ignore error. - env.delete(Path::new(&tempfile)).is_ok(); + let _ = env.delete(Path::new(&tempfile)); return Err(Status::from(e)); } Ok(())