Skip to content

Commit a4ab51a

Browse files
committed
chore: enforce use_self rule
1 parent e8ca9f2 commit a4ab51a

13 files changed

Lines changed: 45 additions & 49 deletions

File tree

‎harbor-client/src/db_models/cashu_mint.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ pub struct CashuMint {
2020
}
2121

2222
impl CashuMint {
23-
pub fn get(conn: &mut SqliteConnection, url: String) -> anyhow::Result<Option<CashuMint>> {
23+
pub fn get(conn: &mut SqliteConnection, url: String) -> anyhow::Result<Option<Self>> {
2424
Ok(cashu_mint::table
2525
.filter(cashu_mint::mint_url.eq(url))
26-
.first::<CashuMint>(conn)
26+
.first::<Self>(conn)
2727
.optional()?)
2828
}
2929

@@ -32,7 +32,7 @@ impl CashuMint {
3232
let exists = cashu_mint::table
3333
.filter(cashu_mint::mint_url.eq(&url))
3434
.filter(cashu_mint::active.eq(1))
35-
.first::<CashuMint>(conn)
35+
.first::<Self>(conn)
3636
.optional()?
3737
.is_some();
3838

@@ -79,15 +79,15 @@ impl CashuMint {
7979
// First check if the federation exists and is active
8080
let exists = cashu_mint::table
8181
.filter(cashu_mint::mint_url.eq(&mint_url))
82-
.first::<CashuMint>(conn)
82+
.first::<Self>(conn)
8383
.optional()?
8484
.is_some();
8585

8686
if exists {
8787
Self::set_active(conn, &mint_url)?;
8888
}
8989

90-
let mint = CashuMint {
90+
let mint = Self {
9191
mint_url,
9292
active: 1,
9393
};

‎harbor-client/src/db_models/fedimint.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ impl Fedimint {
1717
pub fn get_value(conn: &mut SqliteConnection, id: String) -> anyhow::Result<Option<Vec<u8>>> {
1818
Ok(fedimint::table
1919
.filter(fedimint::id.eq(id))
20-
.first::<Fedimint>(conn)
20+
.first::<Self>(conn)
2121
.optional()?
2222
.map(|v| v.value))
2323
}
2424

25-
pub fn get(conn: &mut SqliteConnection, id: String) -> anyhow::Result<Option<Fedimint>> {
25+
pub fn get(conn: &mut SqliteConnection, id: String) -> anyhow::Result<Option<Self>> {
2626
Ok(fedimint::table
2727
.filter(fedimint::id.eq(id))
28-
.first::<Fedimint>(conn)
28+
.first::<Self>(conn)
2929
.optional()?)
3030
}
3131

@@ -34,7 +34,7 @@ impl Fedimint {
3434
let exists = fedimint::table
3535
.filter(fedimint::id.eq(&id))
3636
.filter(fedimint::active.eq(1))
37-
.first::<Fedimint>(conn)
37+
.first::<Self>(conn)
3838
.optional()?
3939
.is_some();
4040

@@ -101,7 +101,7 @@ pub struct NewFedimint {
101101

102102
impl From<&NewFedimint> for Fedimint {
103103
fn from(new_fedimint: &NewFedimint) -> Self {
104-
Fedimint {
104+
Self {
105105
id: new_fedimint.id.clone(),
106106
invite_code: new_fedimint.invite_code.clone(),
107107
value: new_fedimint.value.clone(),

‎harbor-client/src/db_models/mint_metadata.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ pub struct MintMetadata {
2121

2222
impl MintMetadata {
2323
pub fn from(id: FederationId, meta: FederationMeta) -> Self {
24-
MintMetadata {
24+
Self {
2525
id: id.to_string(),
2626
federation_expiry_timestamp: meta
2727
.federation_expiry_timestamp()
@@ -38,10 +38,10 @@ impl MintMetadata {
3838
}
3939
}
4040

41-
pub fn get(conn: &mut SqliteConnection, id: String) -> anyhow::Result<Option<MintMetadata>> {
41+
pub fn get(conn: &mut SqliteConnection, id: String) -> anyhow::Result<Option<Self>> {
4242
Ok(mint_metadata::table
4343
.filter(mint_metadata::id.eq(id))
44-
.first::<MintMetadata>(conn)
44+
.first::<Self>(conn)
4545
.optional()?)
4646
}
4747

@@ -73,8 +73,8 @@ impl MintMetadata {
7373
}
7474

7575
impl From<MintMetadata> for FederationMeta {
76-
fn from(value: MintMetadata) -> FederationMeta {
77-
FederationMeta {
76+
fn from(value: MintMetadata) -> Self {
77+
Self {
7878
federation_name: value.name,
7979
federation_expiry_timestamp: value.federation_expiry_timestamp.map(|f| f.to_string()),
8080
welcome_message: value.welcome_message,

‎harbor-client/src/db_models/mod.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@ pub enum PaymentStatus {
8787
impl PaymentStatus {
8888
pub fn from_i32(status: i32) -> Self {
8989
match status {
90-
0 => PaymentStatus::Pending,
91-
1 => PaymentStatus::WaitingConfirmation,
92-
2 => PaymentStatus::Success,
93-
3 => PaymentStatus::Failed,
90+
0 => Self::Pending,
91+
1 => Self::WaitingConfirmation,
92+
2 => Self::Success,
93+
3 => Self::Failed,
9494
_ => panic!("invalid status"),
9595
}
9696
}

‎harbor-client/src/db_models/profile.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ pub struct Profile {
1616
}
1717

1818
impl Profile {
19-
pub fn get_first(conn: &mut SqliteConnection) -> anyhow::Result<Option<Profile>> {
20-
Ok(profile::table.first::<Profile>(conn).optional()?)
19+
pub fn get_first(conn: &mut SqliteConnection) -> anyhow::Result<Option<Self>> {
20+
Ok(profile::table.first::<Self>(conn).optional()?)
2121
}
2222

2323
pub fn set_onchain_receive_enabled(
@@ -66,7 +66,7 @@ pub struct NewProfile {
6666

6767
impl From<&NewProfile> for Profile {
6868
fn from(new_profile: &NewProfile) -> Self {
69-
Profile {
69+
Self {
7070
id: new_profile.id.clone(),
7171
seed_words: new_profile.seed_words.clone(),
7272
onchain_receive_enabled: 0,

‎harbor-client/src/fedimint_client.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,15 @@ pub enum FederationInviteOrId {
5656
impl FederationInviteOrId {
5757
pub fn federation_id(&self) -> FederationId {
5858
match self {
59-
FederationInviteOrId::Invite(i) => i.federation_id(),
60-
FederationInviteOrId::Id(i) => *i,
59+
Self::Invite(i) => i.federation_id(),
60+
Self::Id(i) => *i,
6161
}
6262
}
6363

6464
pub fn invite_code(&self) -> Option<InviteCode> {
6565
match self {
66-
FederationInviteOrId::Invite(i) => Some(i.clone()),
67-
FederationInviteOrId::Id(_) => None,
66+
Self::Invite(i) => Some(i.clone()),
67+
Self::Id(_) => None,
6868
}
6969
}
7070
}
@@ -277,7 +277,7 @@ impl FedimintClient {
277277

278278
debug!("Built fedimint client");
279279

280-
Ok(FedimintClient {
280+
Ok(Self {
281281
fedimint_client,
282282
stop,
283283
})

‎harbor-client/src/lib.rs‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
clippy::significant_drop_tightening,
1717
clippy::similar_names,
1818
clippy::single_char_pattern,
19-
clippy::too_many_lines,
20-
clippy::use_self
19+
clippy::too_many_lines
2120
)]
2221

2322
use crate::cashu_client::{
@@ -112,15 +111,15 @@ pub enum MintIdentifier {
112111
impl MintIdentifier {
113112
pub fn federation_id(&self) -> Option<FederationId> {
114113
match self {
115-
MintIdentifier::Fedimint(id) => Some(*id),
116-
MintIdentifier::Cashu(_) => None,
114+
Self::Fedimint(id) => Some(*id),
115+
Self::Cashu(_) => None,
117116
}
118117
}
119118

120119
pub fn mint_url(&self) -> Option<MintUrl> {
121120
match self {
122-
MintIdentifier::Cashu(url) => Some(url.clone()),
123-
MintIdentifier::Fedimint(_) => None,
121+
Self::Cashu(url) => Some(url.clone()),
122+
Self::Fedimint(_) => None,
124123
}
125124
}
126125
}

‎harbor-client/src/metadata.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ impl FederationMeta {
8383

8484
impl From<Option<MintInfo>> for FederationMeta {
8585
fn from(info: Option<MintInfo>) -> Self {
86-
FederationMeta {
86+
Self {
8787
federation_name: info.as_ref().and_then(|i| i.name.clone()),
8888
federation_expiry_timestamp: None,
8989
welcome_message: None,

‎harbor-ui/src/components/indicator.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -347,10 +347,8 @@ where
347347
Theme: container::Catalog + 'a,
348348
Renderer: iced::advanced::text::Renderer + 'a,
349349
{
350-
fn from(
351-
indicator: Indicator<'a, Message, Theme, Renderer>,
352-
) -> Element<'a, Message, Theme, Renderer> {
353-
Element::new(indicator)
350+
fn from(indicator: Indicator<'a, Message, Theme, Renderer>) -> Self {
351+
Self::new(indicator)
354352
}
355353
}
356354

‎harbor-ui/src/components/toast.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ impl ToastStatus {
3535
impl fmt::Display for ToastStatus {
3636
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
3737
match self {
38-
ToastStatus::Neutral => "Neutral",
39-
ToastStatus::Good => "Good",
40-
ToastStatus::Bad => "Bad",
38+
Self::Neutral => "Neutral",
39+
Self::Good => "Good",
40+
Self::Bad => "Bad",
4141
}
4242
.fmt(f)
4343
}

0 commit comments

Comments
 (0)