commit c32a42f9b989333c8a6d1b1c6da5f9862de67898
parent 482313f883ec384b1af9afb7e065a1c2c5ad04a3
Author: William Casarin <jb55@jb55.com>
Date: Thu, 6 Feb 2025 12:17:48 -0800
clippy: fix naming lint
Signed-off-by: William Casarin <jb55@jb55.com>
Diffstat:
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/crates/notedeck_columns/src/timeline/kind.rs b/crates/notedeck_columns/src/timeline/kind.rs
@@ -37,7 +37,7 @@ impl PubkeySource {
PubkeySource::Explicit(pubkey)
}
- pub fn to_pubkey<'a>(&'a self, deck_author: &'a Pubkey) -> &'a Pubkey {
+ pub fn as_pubkey<'a>(&'a self, deck_author: &'a Pubkey) -> &'a Pubkey {
match self {
PubkeySource::Explicit(pk) => pk,
PubkeySource::DeckAuthor => deck_author,
@@ -93,7 +93,7 @@ impl ListKind {
parser.parse_all(|p| {
p.parse_token("contact")?;
let pk_src = PubkeySource::parse_from_tokens(p)?;
- Ok(ListKind::Contact(*pk_src.to_pubkey(deck_author)))
+ Ok(ListKind::Contact(*pk_src.as_pubkey(deck_author)))
})
/* here for u when you need more things to parse
@@ -333,7 +333,7 @@ impl TimelineKind {
let profile = parser.try_parse(|p| {
p.parse_token("profile")?;
let pk_src = PubkeySource::parse_from_tokens(p)?;
- Ok(TimelineKind::Profile(*pk_src.to_pubkey(deck_author)))
+ Ok(TimelineKind::Profile(*pk_src.as_pubkey(deck_author)))
});
if profile.is_ok() {
return profile;
@@ -343,7 +343,7 @@ impl TimelineKind {
// still handle deprecated form (notifs)
p.parse_any_token(&[NOTIFS_TOKEN, NOTIFS_TOKEN_DEPRECATED])?;
let pk_src = PubkeySource::parse_from_tokens(p)?;
- Ok(TimelineKind::Notifications(*pk_src.to_pubkey(deck_author)))
+ Ok(TimelineKind::Notifications(*pk_src.as_pubkey(deck_author)))
});
if notifications.is_ok() {
return notifications;
diff --git a/crates/notedeck_columns/src/ui/add_column.rs b/crates/notedeck_columns/src/ui/add_column.rs
@@ -150,7 +150,7 @@ impl AddColumnOption {
.into_timeline(&txn, ndb)
.map(AddColumnResponse::Timeline),
AddColumnOption::Notification(pubkey) => {
- TimelineKind::Notifications(*pubkey.to_pubkey(&cur_account.map(|kp| kp.pubkey)?))
+ TimelineKind::Notifications(*pubkey.as_pubkey(&cur_account.map(|kp| kp.pubkey)?))
.into_timeline(&txn, ndb)
.map(AddColumnResponse::Timeline)
}
@@ -159,7 +159,7 @@ impl AddColumnOption {
}
AddColumnOption::Contacts(pk_src) => {
let tlk = TimelineKind::contact_list(
- *pk_src.to_pubkey(&cur_account.map(|kp| kp.pubkey)?),
+ *pk_src.as_pubkey(&cur_account.map(|kp| kp.pubkey)?),
);
tlk.into_timeline(&txn, ndb)
.map(AddColumnResponse::Timeline)
@@ -173,7 +173,7 @@ impl AddColumnOption {
AddColumnOption::ExternalIndividual => Some(AddColumnResponse::ExternalIndividual),
AddColumnOption::Individual(pubkey_source) => {
let tlk = TimelineKind::profile(
- *pubkey_source.to_pubkey(&cur_account.map(|kp| kp.pubkey)?),
+ *pubkey_source.as_pubkey(&cur_account.map(|kp| kp.pubkey)?),
);
tlk.into_timeline(&txn, ndb)
.map(AddColumnResponse::Timeline)