GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-07-07 20:06:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fix new clippy warnings

Browse source
This commit is contained in:
Dustin J. Mitchell 2021-09-05 21:55:09 +00:00
parent fd2add5dea
commit 72b4941485
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cli/src/invocation/mod.rs
View file

@ -125,7 +125,7 @@ fn get_server(settings: &Settings) -> anyhow::Result<Box<dyn Server>> {
settings.server_origin.as_ref(), settings.server_origin.as_ref(),
settings.encryption_secret.as_ref(), settings.encryption_secret.as_ref(),
) { ) {
let client_key = Uuid::parse_str(&client_key)?; let client_key = Uuid::parse_str(client_key)?;
log::debug!("Using sync-server with origin {}", origin); log::debug!("Using sync-server with origin {}", origin);
log::debug!("Sync client ID: {}", client_key); log::debug!("Sync client ID: {}", client_key);

4
cli/src/invocation/modify.rs
View file

@ -30,11 +30,11 @@ pub(super) fn apply_modification(
} }
for tag in modification.add_tags.iter() { for tag in modification.add_tags.iter() {
task.add_tag(&tag)?; task.add_tag(tag)?;
} }
for tag in modification.remove_tags.iter() { for tag in modification.remove_tags.iter() {
task.remove_tag(&tag)?; task.remove_tag(tag)?;
} }
if let Some(wait) = modification.wait { if let Some(wait) = modification.wait {

2
cli/src/settings/report.rs
View file

@ -130,7 +130,7 @@ impl TryFrom<&toml::Value> for Report {
.map(|(i, v)| { .map(|(i, v)| {
v.as_str() v.as_str()
.ok_or_else(|| anyhow!(".filter[{}]: not a string", i)) .ok_or_else(|| anyhow!(".filter[{}]: not a string", i))
.and_then(|s| Condition::parse_str(&s)) .and_then(|s| Condition::parse_str(s))
.map_err(|e| anyhow!(".filter[{}]: {}", i, e)) .map_err(|e| anyhow!(".filter[{}]: {}", i, e))
}) })
.collect::<Result<Vec<_>>>()?, .collect::<Result<Vec<_>>>()?,

2
cli/src/settings/settings.rs
View file

@ -97,7 +97,7 @@ impl Settings {
"server_dir", "server_dir",
"reports", "reports",
]; ];
let table = table_with_keys(&config_toml, &table_keys)?; let table = table_with_keys(config_toml, &table_keys)?;
fn get_str_cfg<F: FnOnce(String)>( fn get_str_cfg<F: FnOnce(String)>(
table: &Table, table: &Table,

8
sync-server/src/storage/kv.rs
View file

@ -86,7 +86,7 @@ impl<'t> StorageTxn for Txn<'t> {
let bucket = self.clients_bucket(); let bucket = self.clients_bucket();
let kvtxn = self.kvtxn(); let kvtxn = self.kvtxn();
let client = match kvtxn.get(&bucket, key) { let client = match kvtxn.get(bucket, key) {
Ok(buf) => buf, Ok(buf) => buf,
Err(Error::NotFound) => return Ok(None), Err(Error::NotFound) => return Ok(None),
Err(e) => return Err(e.into()), Err(e) => return Err(e.into()),
@ -101,7 +101,7 @@ impl<'t> StorageTxn for Txn<'t> {
let bucket = self.clients_bucket(); let bucket = self.clients_bucket();
let kvtxn = self.kvtxn(); let kvtxn = self.kvtxn();
let client = Client { latest_version_id }; let client = Client { latest_version_id };
kvtxn.set(&bucket, key, Msgpack::to_value_buf(client)?)?; kvtxn.set(bucket, key, Msgpack::to_value_buf(client)?)?;
Ok(()) Ok(())
} }
@ -122,7 +122,7 @@ impl<'t> StorageTxn for Txn<'t> {
let key = version_db_key(client_key, parent_version_id); let key = version_db_key(client_key, parent_version_id);
let bucket = self.versions_bucket(); let bucket = self.versions_bucket();
let kvtxn = self.kvtxn(); let kvtxn = self.kvtxn();
let version = match kvtxn.get(&bucket, key) { let version = match kvtxn.get(bucket, key) {
Ok(buf) => buf, Ok(buf) => buf,
Err(Error::NotFound) => return Ok(None), Err(Error::NotFound) => return Ok(None),
Err(e) => return Err(e.into()), Err(e) => return Err(e.into()),
@ -147,7 +147,7 @@ impl<'t> StorageTxn for Txn<'t> {
parent_version_id, parent_version_id,
history_segment, history_segment,
}; };
kvtxn.set(&bucket, key, Msgpack::to_value_buf(version)?)?; kvtxn.set(bucket, key, Msgpack::to_value_buf(version)?)?;
Ok(()) Ok(())
} }