mirror of
https://gitlab.com/keys.openpgp.org/hagrid.git
synced 2025-10-05 16:12:44 +02:00
Fix linting errors after Rust version upgrade.
Command: just lint Changes: - Fix the following linting errors: warning: this `if` statement can be collapsed --> database/src/fs.rs:335:5 | 335 | / if let Ok(target) = read_link(link) { 336 | | if target == expected { 337 | | remove_file(link)?; 338 | | } 339 | | } | |_____^ | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#collapsible_if = note: `#[warn(clippy::collapsible_if)]` on by default help: collapse nested if block | 335 ~ if let Ok(target) = read_link(link) 336 ~ && target == expected { 337 | remove_file(link)?; 338 ~ } | warning: this `if` statement can be collapsed --> database/src/fs.rs:510:9 | 510 | / if let Ok(target) = read_link(&link_fpr) { 511 | | if target == expected { 512 | | remove_file(&link_fpr)?; 513 | | } 514 | | } | |_________^ | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#collapsible_if help: collapse nested if block | 510 ~ if let Ok(target) = read_link(&link_fpr) 511 ~ && target == expected { 512 | remove_file(&link_fpr)?; 513 ~ } | warning: this `if` statement can be collapsed --> database/src/fs.rs:515:9 | 515 | / if let Ok(target) = read_link(&link_keyid) { 516 | | if target == expected { 517 | | remove_file(link_keyid)?; 518 | | } 519 | | } | |_________^ | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#collapsible_if help: collapse nested if block | 515 ~ if let Ok(target) = read_link(&link_keyid) 516 ~ && target == expected { 517 | remove_file(link_keyid)?; 518 ~ } | warning: this `if` statement can be collapsed --> database/src/fs.rs:630:9 | 630 | / if let Ok(link_fpr_target) = link_fpr.canonicalize() { 631 | | if !link_fpr_target.ends_with(&path_published) { 632 | | info!( 633 | | "Fingerprint points to different key for {} (expected {:?} to be suffix of {:?})", ... | 638 | | } | |_________^ | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#collapsible_if help: collapse nested if block | 630 ~ if let Ok(link_fpr_target) = link_fpr.canonicalize() 631 ~ && !link_fpr_target.ends_with(&path_published) { 632 | info!( ... 636 | return Err(anyhow!(format!("Fingerprint collision for key {}", fpr))); 637 ~ } | warning: this `if` statement can be collapsed --> database/src/fs.rs:640:9 | 640 | / if let Ok(link_keyid_target) = link_keyid.canonicalize() { 641 | | if !link_keyid_target.ends_with(&path_published) { 642 | | info!( 643 | | "KeyID points to different key for {} (expected {:?} to be suffix of {:?})", ... | 648 | | } | |_________^ | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#collapsible_if help: collapse nested if block | 640 ~ if let Ok(link_keyid_target) = link_keyid.canonicalize() 641 ~ && !link_keyid_target.ends_with(&path_published) { 642 | info!( ... 646 | return Err(anyhow!(format!("KeyID collision for key {}", fpr))); 647 ~ } | warning: this `if` statement can be collapsed --> database/src/lib.rs:534:9 | 534 | / if let Some(current_fpr) = current_link_fpr { 535 | | if current_fpr != *fpr_primary { 536 | | self.set_email_unpublished_filter(tx, ¤t_fpr, |uid| { 537 | | Email::try_from(uid) ... | 542 | | } | |_________^ | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#collapsible_if help: collapse nested if block | 534 ~ if let Some(current_fpr) = current_link_fpr 535 ~ && current_fpr != *fpr_primary { 536 | self.set_email_unpublished_filter(tx, ¤t_fpr, |uid| { ... 540 | })?; 541 ~ } | warning: this `if` statement can be collapsed --> hagridctl/src/delete.rs:79:9 | 79 | / if err.is_ok() { 80 | | if let Err(e) = result { 81 | | err = Err(e); 82 | | } 83 | | } | |_________^ | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#collapsible_if = note: `#[warn(clippy::collapsible_if)]` on by default help: collapse nested if block | 79 ~ if err.is_ok() 80 ~ && let Err(e) = result { 81 | err = Err(e); 82 ~ } | warning: this `if` statement can be collapsed --> hagridctl/src/import.rs:197:9 | 197 | / if !acc.is_empty() { 198 | | if let Packet::PublicKey(_) | Packet::SecretKey(_) = packet { 199 | | callback(acc); 200 | | acc = vec![]; 201 | | } 202 | | } | |_________^ | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#collapsible_if help: collapse nested if block | 197 ~ if !acc.is_empty() 198 ~ && let Packet::PublicKey(_) | Packet::SecretKey(_) = packet { 199 | callback(acc); 200 | acc = vec![]; 201 ~ } | warning: this `if` statement can be collapsed --> src/dump.rs:522:25 | 522 | / if pd.mpis { 523 | | if let Ok(ciphertext) = e.ciphertext() { 524 | | pd.dump_mpis(output, &ii, &[ciphertext], &["ciphertext"])?; 525 | | } 526 | | } | |_________________________^ | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#collapsible_if = note: `#[warn(clippy::collapsible_if)]` on by default help: collapse nested if block | 522 ~ if pd.mpis 523 ~ && let Ok(ciphertext) = e.ciphertext() { 524 | pd.dump_mpis(output, &ii, &[ciphertext], &["ciphertext"])?; 525 ~ } |
This commit is contained in:
committed by
Vincent Breitmoser
parent
0dceaa454f
commit
0fe99ba962
@@ -332,10 +332,10 @@ fn symlink(symlink_content: &Path, symlink_name: &Path) -> anyhow::Result<()> {
|
||||
}
|
||||
|
||||
fn symlink_unlink_with_check(link: &Path, expected: &Path) -> anyhow::Result<()> {
|
||||
if let Ok(target) = read_link(link) {
|
||||
if target == expected {
|
||||
remove_file(link)?;
|
||||
}
|
||||
if let Ok(target) = read_link(link)
|
||||
&& target == expected
|
||||
{
|
||||
remove_file(link)?;
|
||||
}
|
||||
|
||||
Ok(())
|
||||
@@ -507,15 +507,15 @@ impl<'a> DatabaseTransaction<'a> for FilesystemTransaction<'a> {
|
||||
)
|
||||
.unwrap();
|
||||
|
||||
if let Ok(target) = read_link(&link_fpr) {
|
||||
if target == expected {
|
||||
remove_file(&link_fpr)?;
|
||||
}
|
||||
if let Ok(target) = read_link(&link_fpr)
|
||||
&& target == expected
|
||||
{
|
||||
remove_file(&link_fpr)?;
|
||||
}
|
||||
if let Ok(target) = read_link(&link_keyid) {
|
||||
if target == expected {
|
||||
remove_file(link_keyid)?;
|
||||
}
|
||||
if let Ok(target) = read_link(&link_keyid)
|
||||
&& target == expected
|
||||
{
|
||||
remove_file(link_keyid)?;
|
||||
}
|
||||
|
||||
Ok(())
|
||||
@@ -627,24 +627,24 @@ impl<'a> Database<'a> for Filesystem {
|
||||
|
||||
let path_published = self.fingerprint_to_path_published(fpr_target);
|
||||
|
||||
if let Ok(link_fpr_target) = link_fpr.canonicalize() {
|
||||
if !link_fpr_target.ends_with(&path_published) {
|
||||
info!(
|
||||
"Fingerprint points to different key for {} (expected {:?} to be suffix of {:?})",
|
||||
fpr, &path_published, &link_fpr_target
|
||||
);
|
||||
return Err(anyhow!(format!("Fingerprint collision for key {}", fpr)));
|
||||
}
|
||||
if let Ok(link_fpr_target) = link_fpr.canonicalize()
|
||||
&& !link_fpr_target.ends_with(&path_published)
|
||||
{
|
||||
info!(
|
||||
"Fingerprint points to different key for {} (expected {:?} to be suffix of {:?})",
|
||||
fpr, &path_published, &link_fpr_target
|
||||
);
|
||||
return Err(anyhow!(format!("Fingerprint collision for key {}", fpr)));
|
||||
}
|
||||
|
||||
if let Ok(link_keyid_target) = link_keyid.canonicalize() {
|
||||
if !link_keyid_target.ends_with(&path_published) {
|
||||
info!(
|
||||
"KeyID points to different key for {} (expected {:?} to be suffix of {:?})",
|
||||
fpr, &path_published, &link_keyid_target
|
||||
);
|
||||
return Err(anyhow!(format!("KeyID collision for key {}", fpr)));
|
||||
}
|
||||
if let Ok(link_keyid_target) = link_keyid.canonicalize()
|
||||
&& !link_keyid_target.ends_with(&path_published)
|
||||
{
|
||||
info!(
|
||||
"KeyID points to different key for {} (expected {:?} to be suffix of {:?})",
|
||||
fpr, &path_published, &link_keyid_target
|
||||
);
|
||||
return Err(anyhow!(format!("KeyID collision for key {}", fpr)));
|
||||
}
|
||||
|
||||
if !link_fpr.exists() || !link_keyid.exists() {
|
||||
|
@@ -531,15 +531,16 @@ pub trait Database<'a>: Sync + Send {
|
||||
) -> anyhow::Result<()> {
|
||||
let current_link_fpr =
|
||||
self.lookup_primary_fingerprint(&Query::ByEmail(unlink_email.clone()));
|
||||
if let Some(current_fpr) = current_link_fpr {
|
||||
if current_fpr != *fpr_primary {
|
||||
self.set_email_unpublished_filter(tx, ¤t_fpr, |uid| {
|
||||
Email::try_from(uid)
|
||||
.map(|email| email != *unlink_email)
|
||||
.unwrap_or(false)
|
||||
})?;
|
||||
}
|
||||
if let Some(current_fpr) = current_link_fpr
|
||||
&& current_fpr != *fpr_primary
|
||||
{
|
||||
self.set_email_unpublished_filter(tx, ¤t_fpr, |uid| {
|
||||
Email::try_from(uid)
|
||||
.map(|email| email != *unlink_email)
|
||||
.unwrap_or(false)
|
||||
})?;
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
|
@@ -76,10 +76,10 @@ pub(crate) fn run(
|
||||
"Deleted".into()
|
||||
}
|
||||
);
|
||||
if err.is_ok() {
|
||||
if let Err(e) = result {
|
||||
err = Err(e);
|
||||
}
|
||||
if err.is_ok()
|
||||
&& let Err(e) = result
|
||||
{
|
||||
err = Err(e);
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -194,11 +194,11 @@ fn read_file_to_tpks(
|
||||
let (packet, tmp) = pp.next()?;
|
||||
ppr = tmp;
|
||||
|
||||
if !acc.is_empty() {
|
||||
if let Packet::PublicKey(_) | Packet::SecretKey(_) = packet {
|
||||
callback(acc);
|
||||
acc = vec![];
|
||||
}
|
||||
if !acc.is_empty()
|
||||
&& let Packet::PublicKey(_) | Packet::SecretKey(_) = packet
|
||||
{
|
||||
callback(acc);
|
||||
acc = vec![];
|
||||
}
|
||||
|
||||
acc.push(packet);
|
||||
|
@@ -519,10 +519,10 @@ impl PacketDumper {
|
||||
write!(output, "{} S2K: ", ii)?;
|
||||
pd.dump_s2k(output, &ii, e.s2k())?;
|
||||
writeln!(output, "{} Sym. algo: {}", ii, e.algo())?;
|
||||
if pd.mpis {
|
||||
if let Ok(ciphertext) = e.ciphertext() {
|
||||
pd.dump_mpis(output, &ii, &[ciphertext], &["ciphertext"])?;
|
||||
}
|
||||
if pd.mpis
|
||||
&& let Ok(ciphertext) = e.ciphertext()
|
||||
{
|
||||
pd.dump_mpis(output, &ii, &[ciphertext], &["ciphertext"])?;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user