cargo clippy --fix --lib -p liana_gui

gui/src/app/settings.rs

@@ -1,3 +1,5 @@
+//! Settings is the module to handle the GUI settings file.
+//! The settings file is used by the GUI to store useful information.
 use std::collections::HashMap;
 use std::fs::OpenOptions;
 use std::io::Write;
@@ -8,8 +10,6 @@ use serde::{Deserialize, Serialize};
 
 use crate::{app::wallet::Wallet, hw::HardwareWalletConfig};
 
-///! Settings is the module to handle the GUI settings file.
-///! The settings file is used by the GUI to store useful information.
 pub const DEFAULT_FILE_NAME: &str = "settings.json";
 
 #[derive(Debug, Clone, Deserialize, Serialize)]

gui/src/app/state/coins.rs

@@ -64,13 +64,7 @@ impl CoinsPanel {
  fn update_coins(&mut self, coins: &[Coin]) {
  self.coins.list = coins
  .iter()
- .filter_map(|coin| {
- if coin.spend_info.is_none() {
- Some(coin)
- } else {
- None
- }
- })
+ .filter(|coin| coin.spend_info.is_none())
  .cloned()
  .collect();
 
@@ -171,7 +165,7 @@ impl State for CoinsPanel {
  let coins = daemon2
  .list_coins()
  .map(|res| res.coins)
- .map_err(|e| Error::from(e))?;
+ .map_err(Error::from)?;
  let mut targets = HashSet::<LabelItem>::new();
  for coin in coins {
  targets.insert(LabelItem::OutPoint(coin.outpoint));

gui/src/app/state/mod.rs

@@ -102,7 +102,7 @@ impl State for Home {
  cache,
  event,
  output_index,
- &self.labels_edited.cache(),
+ self.labels_edited.cache(),
  self.warning.as_ref(),
  )
  } else {
@@ -329,7 +329,7 @@ impl State for ReceivePanel {
  &self.addresses.list,
  self.qr_code.as_ref(),
  &self.addresses.labels,
- &self.labels_edited.cache(),
+ self.labels_edited.cache(),
  ),
  )
  }

gui/src/app/state/psbt.rs

@@ -89,7 +89,7 @@ impl PsbtState {
  self.action = None;
  }
  view::SpendTxMessage::Delete => {
- self.action = Some(Box::new(DeleteAction::default()));
+ self.action = Some(Box::<DeleteAction>::default());
  }
  view::SpendTxMessage::Sign => {
  let action = SignAction::new(self.tx.signers(), self.wallet.clone());
@@ -104,10 +104,10 @@ impl PsbtState {
  return cmd;
  }
  view::SpendTxMessage::Broadcast => {
- self.action = Some(Box::new(BroadcastAction::default()));
+ self.action = Some(Box::<BroadcastAction>::default());
  }
  view::SpendTxMessage::Save => {
- self.action = Some(Box::new(SaveAction::default()));
+ self.action = Some(Box::<SaveAction>::default());
  }
  _ => {
  if let Some(action) = self.action.as_mut() {
@@ -151,7 +151,7 @@ impl PsbtState {
  self.saved,
  &self.desc_policy,
  &self.wallet.keys_aliases,
- &self.labels_edited.cache(),
+ self.labels_edited.cache(),
  cache.network,
  self.warning.as_ref(),
  );

gui/src/app/state/spend/mod.rs

@@ -122,7 +122,7 @@ impl State for CreateSpendPanel {
  let coins = daemon
  .list_coins()
  .map(|res| res.coins)
- .map_err(|e| Error::from(e))?;
+ .map_err(Error::from)?;
  let mut targets = HashSet::<LabelItem>::new();
  for coin in coins {
  targets.insert(LabelItem::OutPoint(coin.outpoint));

gui/src/app/state/spend/step.rs

@@ -541,7 +541,7 @@ impl Step for SaveSpend {
  spend.saved,
  &spend.desc_policy,
  &spend.wallet.keys_aliases,
- &spend.labels_edited.cache(),
+ spend.labels_edited.cache(),
  cache.network,
  spend.warning.as_ref(),
  );

gui/src/app/state/transactions.rs

@@ -52,7 +52,7 @@ impl State for TransactionsPanel {
  view::transactions::tx_view(
  cache,
  tx,
- &self.labels_edited.cache(),
+ self.labels_edited.cache(),
  self.warning.as_ref(),
  )
  } else {

gui/src/app/view/coins.rs

@@ -259,7 +259,7 @@ pub fn coin_sequence_label<'a, T: 'a>(seq: u32, timelock: u32) -> Container<'a,
  )
  .padding(10)
  .style(theme::Container::Pill(theme::Pill::Warning))
- } else if seq < timelock as u32 * 10 / 100 {
+ } else if seq < timelock * 10 / 100 {
  Container::new(
  Row::new()
  .spacing(5)

gui/src/app/view/home.rs

@@ -146,7 +146,7 @@ pub fn home_view<'a>(
  .into()
 }
 
-fn event_list_view<'a>(i: usize, event: &'a HistoryTransaction) -> Column<'a, Message> {
+fn event_list_view(i: usize, event: &HistoryTransaction) -> Column<'_, Message> {
  event.tx.output.iter().enumerate().fold(
  Column::new().spacing(10),
  |col, (output_index, output)| {
@@ -158,14 +158,15 @@ fn event_list_view<'a>(i: usize, event: &'a HistoryTransaction) -> Column<'a, Me
  .to_string(),
  ) {
  Some(p1_bold(label))
- } else if let Some(label) = event.labels.get(
- &bitcoin::Address::from_script(&output.script_pubkey, event.network)
- .unwrap()
- .to_string(),
- ) {
- Some(p1_bold(format!("address label: {}", label)).style(color::GREY_3))
  } else {
- None
+ event
+ .labels
+ .get(
+ &bitcoin::Address::from_script(&output.script_pubkey, event.network)
+ .unwrap()
+ .to_string(),
+ )
+ .map(|label| p1_bold(format!("address label: {}", label)).style(color::GREY_3))
  };
  if event.is_external() {
  if !event.change_indexes.contains(&output_index) {

gui/src/app/view/label.rs

@@ -9,11 +9,11 @@ use liana_ui::{
 
 use crate::app::view;
 
-pub fn label_editable<'a>(
+pub fn label_editable(
  labelled: String,
- label: Option<&'a String>,
+ label: Option<&String>,
  size: u16,
-) -> Element<'a, view::Message> {
+) -> Element<'_, view::Message> {
  if let Some(label) = label {
  if !label.is_empty() {
  return Container::new(

gui/src/app/view/pbst.rs

@@ -38,6 +38,7 @@ use crate::{
  hw::HardwareWallet,
 };
 
+#[allow(clippy::too_many_arguments)]
 pub fn psbt_view<'a>(
  cache: &'a Cache,
  tx: &'a SpendTx,

gui/src/app/view/psbt.rs

@@ -39,6 +39,7 @@ use crate::{
  hw::HardwareWallet,
 };
 
+#[allow(clippy::too_many_arguments)]
 pub fn psbt_view<'a>(
  cache: &'a Cache,
  tx: &'a SpendTx,
@@ -584,7 +585,7 @@ pub fn inputs_and_outputs_view<'a>(
  .enumerate()
  .filter(|(i, _)| {
  if let Some(indexes) = change_indexes_copy.as_ref() {
- !indexes.contains(&i)
+ !indexes.contains(i)
  } else {
  true
  }
@@ -634,7 +635,7 @@ pub fn inputs_and_outputs_view<'a>(
  .enumerate()
  .filter(|(i, _)| {
  if let Some(indexes) = change_indexes_copy.as_ref() {
- !indexes.contains(&i)
+ !indexes.contains(i)
  } else {
  true
  }
@@ -697,7 +698,7 @@ pub fn inputs_and_outputs_view<'a>(
  tx.output
  .iter()
  .enumerate()
- .filter(|(i, _)| change_indexes.as_ref().unwrap().contains(&i))
+ .filter(|(i, _)| change_indexes.as_ref().unwrap().contains(i))
  .fold(
  Column::new().padding(20),
  |col: Column<'a, Message>, (i, output)| {

gui/src/app/view/psbts.rs

@@ -59,7 +59,7 @@ pub fn import_psbt_success_view<'a>() -> Element<'a, Message> {
  .into()
 }
 
-pub fn psbts_view<'a>(spend_txs: &'a [SpendTx]) -> Element<'a, Message> {
+pub fn psbts_view(spend_txs: &[SpendTx]) -> Element<'_, Message> {
  Column::new()
  .push(
  Row::new()
@@ -90,7 +90,7 @@ pub fn psbts_view<'a>(spend_txs: &'a [SpendTx]) -> Element<'a, Message> {
  .into()
 }
 
-fn spend_tx_list_view<'a>(i: usize, tx: &'a SpendTx) -> Element<'a, Message> {
+fn spend_tx_list_view(i: usize, tx: &SpendTx) -> Element<'_, Message> {
  Container::new(
  Button::new(
  Row::new()
@@ -127,7 +127,7 @@ fn spend_tx_list_view<'a>(i: usize, tx: &'a SpendTx) -> Element<'a, Message> {
  .push_maybe(
  tx.labels
  .get(&tx.psbt.unsigned_tx.txid().to_string())
- .map(|label| p1_bold(label)),
+ .map(p1_bold),
  )
  .spacing(10)
  .align_items(Alignment::Center)

gui/src/app/view/spend/mod.rs

@@ -29,6 +29,7 @@ use crate::{
  daemon::model::{remaining_sequence, Coin, SpendTx},
 };
 
+#[allow(clippy::too_many_arguments)]
 pub fn spend_view<'a>(
  cache: &'a Cache,
  tx: &'a SpendTx,

gui/src/app/view/transactions.rs

@@ -84,7 +84,7 @@ pub fn transactions_view<'a>(
  )
 }
 
-fn tx_list_view<'a>(i: usize, tx: &'a HistoryTransaction) -> Element<'a, Message> {
+fn tx_list_view(i: usize, tx: &HistoryTransaction) -> Element<'_, Message> {
  Container::new(
  Button::new(
  Row::new()
@@ -99,11 +99,7 @@ fn tx_list_view<'a>(i: usize, tx: &'a HistoryTransaction) -> Element<'a, Message
  })
  .push(
  Column::new()
- .push_maybe(
- tx.labels
- .get(&tx.tx.txid().to_string())
- .map(|label| p1_bold(label)),
- )
+ .push_maybe(tx.labels.get(&tx.tx.txid().to_string()).map(p1_bold))
  .push_maybe(tx.time.map(|t| {
  Container::new(
  text(format!(

gui/src/daemon/model.rs

@@ -137,7 +137,7 @@ impl SpendTx {
  .output
  .iter()
  .enumerate()
- .filter(|(i, _)| !self.change_indexes.contains(&i))
+ .filter(|(i, _)| !self.change_indexes.contains(i))
  .count()
  > 1
  }
@@ -153,7 +153,7 @@ impl Labelled for SpendTx {
  items.push(LabelItem::Txid(txid));
  for coin in &self.coins {
  items.push(LabelItem::Address(coin.address.clone()));
- items.push(LabelItem::OutPoint(coin.outpoint.clone()));
+ items.push(LabelItem::OutPoint(coin.outpoint));
  }
  for (vout, output) in self.psbt.unsigned_tx.output.iter().enumerate() {
  items.push(LabelItem::OutPoint(OutPoint {
@@ -240,7 +240,7 @@ impl HistoryTransaction {
  .output
  .iter()
  .enumerate()
- .filter(|(i, _)| !self.change_indexes.contains(&i))
+ .filter(|(i, _)| !self.change_indexes.contains(i))
  .count()
  > 1
  }
@@ -256,7 +256,7 @@ impl Labelled for HistoryTransaction {
  items.push(LabelItem::Txid(txid));
  for coin in &self.coins {
  items.push(LabelItem::Address(coin.address.clone()));
- items.push(LabelItem::OutPoint(coin.outpoint.clone()));
+ items.push(LabelItem::OutPoint(coin.outpoint));
  }
  for (vout, output) in self.tx.output.iter().enumerate() {
  items.push(LabelItem::OutPoint(OutPoint {