Skip to content

Commit 139fbfa

Browse files
link2xtlink2xt
committed
chore: nightly clippy fixes
1 parent 0568393 commit 139fbfa

File tree

14 files changed

+28
-28
lines changed

14 files changed

+28
-28
lines changed

‎deltachat-contact-tools/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ impl ContactAddress {
7676

7777
/// Allow converting [`ContactAddress`] to an SQLite type.
7878
impl rusqlite::types::ToSql for ContactAddress {
79-
fn to_sql(&self) -> rusqlite::Result<rusqlite::types::ToSqlOutput> {
79+
fn to_sql(&self) -> rusqlite::Result<rusqlite::types::ToSqlOutput<'_>> {
8080
let val = rusqlite::types::Value::Text(self.0.to_string());
8181
let out = rusqlite::types::ToSqlOutput::Owned(val);
8282
Ok(out)
@@ -282,7 +282,7 @@ impl EmailAddress {
282282
}
283283

284284
impl rusqlite::types::ToSql for EmailAddress {
285-
fn to_sql(&self) -> rusqlite::Result<rusqlite::types::ToSqlOutput> {
285+
fn to_sql(&self) -> rusqlite::Result<rusqlite::types::ToSqlOutput<'_>> {
286286
let val = rusqlite::types::Value::Text(self.to_string());
287287
let out = rusqlite::types::ToSqlOutput::Owned(val);
288288
Ok(out)

‎deltachat-ffi/src/lot.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ pub enum Meaning {
3434
}
3535

3636
impl Lot {
37-
pub fn get_text1(&self) -> Option<Cow<str>> {
37+
pub fn get_text1(&self) -> Option<Cow<'_, str>> {
3838
match self {
3939
Self::Summary(summary) => match &summary.prefix {
4040
None => None,
@@ -66,7 +66,7 @@ impl Lot {
6666
}
6767
}
6868

69-
pub fn get_text2(&self) -> Option<Cow<str>> {
69+
pub fn get_text2(&self) -> Option<Cow<'_, str>> {
7070
match self {
7171
Self::Summary(summary) => Some(summary.truncated_text(160)),
7272
Self::Qr(_) => None,

‎deltachat-repl/src/cmdline.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
493493
"send-backup" => {
494494
let provider = BackupProvider::prepare(&context).await?;
495495
let qr = format_backup(&provider.qr())?;
496-
println!("QR code: {}", qr);
496+
println!("QR code: {qr}");
497497
qr2term::print_qr(qr.as_str())?;
498498
provider.await?;
499499
}

‎deltachat-repl/src/main.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,25 +41,25 @@ fn receive_event(event: EventType) {
4141
match event {
4242
EventType::Info(msg) => {
4343
/* do not show the event as this would fill the screen */
44-
info!("{}", msg);
44+
info!("{msg}");
4545
}
4646
EventType::SmtpConnected(msg) => {
47-
info!("[SMTP_CONNECTED] {}", msg);
47+
info!("[SMTP_CONNECTED] {msg}");
4848
}
4949
EventType::ImapConnected(msg) => {
50-
info!("[IMAP_CONNECTED] {}", msg);
50+
info!("[IMAP_CONNECTED] {msg}");
5151
}
5252
EventType::SmtpMessageSent(msg) => {
53-
info!("[SMTP_MESSAGE_SENT] {}", msg);
53+
info!("[SMTP_MESSAGE_SENT] {msg}");
5454
}
5555
EventType::Warning(msg) => {
56-
warn!("{}", msg);
56+
warn!("{msg}");
5757
}
5858
EventType::Error(msg) => {
59-
error!("{}", msg);
59+
error!("{msg}");
6060
}
6161
EventType::ErrorSelfNotInGroup(msg) => {
62-
error!("[SELF_NOT_IN_GROUP] {}", msg);
62+
error!("[SELF_NOT_IN_GROUP] {msg}");
6363
}
6464
EventType::MsgsChanged { chat_id, msg_id } => {
6565
info!(
@@ -124,7 +124,7 @@ fn receive_event(event: EventType) {
124124
);
125125
}
126126
_ => {
127-
info!("Received {:?}", event);
127+
info!("Received {event:?}");
128128
}
129129
}
130130
}

‎deltachat-rpc-server/src/main.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ async fn main_impl() -> Result<()> {
7373
.init();
7474

7575
let path = std::env::var("DC_ACCOUNTS_PATH").unwrap_or_else(|_| "accounts".to_string());
76-
log::info!("Starting with accounts directory `{}`.", path);
76+
log::info!("Starting with accounts directory `{path}`.");
7777
let writable = true;
7878
let accounts = Accounts::new(PathBuf::from(&path), writable).await?;
7979

@@ -97,7 +97,7 @@ async fn main_impl() -> Result<()> {
9797
Some(message) => serde_json::to_string(&message)?,
9898
}
9999
};
100-
log::trace!("RPC send {}", message);
100+
log::trace!("RPC send {message}");
101101
println!("{message}");
102102
}
103103
Ok(())
@@ -141,7 +141,7 @@ async fn main_impl() -> Result<()> {
141141
Some(message) => message,
142142
}
143143
};
144-
log::trace!("RPC recv {}", message);
144+
log::trace!("RPC recv {message}");
145145
let session = session.clone();
146146
tokio::spawn(async move {
147147
session.handle_incoming(&message).await;

‎src/chat.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1508,7 +1508,7 @@ impl std::fmt::Display for ChatId {
15081508
/// This allows you to directly store [ChatId] into the database as
15091509
/// well as query for a [ChatId].
15101510
impl rusqlite::types::ToSql for ChatId {
1511-
fn to_sql(&self) -> rusqlite::Result<rusqlite::types::ToSqlOutput> {
1511+
fn to_sql(&self) -> rusqlite::Result<rusqlite::types::ToSqlOutput<'_>> {
15121512
let val = rusqlite::types::Value::Integer(i64::from(self.0));
15131513
let out = rusqlite::types::ToSqlOutput::Owned(val);
15141514
Ok(out)
@@ -2380,7 +2380,7 @@ pub enum ChatVisibility {
23802380
}
23812381

23822382
impl rusqlite::types::ToSql for ChatVisibility {
2383-
fn to_sql(&self) -> rusqlite::Result<rusqlite::types::ToSqlOutput> {
2383+
fn to_sql(&self) -> rusqlite::Result<rusqlite::types::ToSqlOutput<'_>> {
23842384
let val = rusqlite::types::Value::Integer(*self as i64);
23852385
let out = rusqlite::types::ToSqlOutput::Owned(val);
23862386
Ok(out)
@@ -4026,7 +4026,7 @@ pub enum MuteDuration {
40264026
}
40274027

40284028
impl rusqlite::types::ToSql for MuteDuration {
4029-
fn to_sql(&self) -> rusqlite::Result<rusqlite::types::ToSqlOutput> {
4029+
fn to_sql(&self) -> rusqlite::Result<rusqlite::types::ToSqlOutput<'_>> {
40304030
let duration: i64 = match &self {
40314031
MuteDuration::NotMuted => 0,
40324032
MuteDuration::Forever => -1,

‎src/contact.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ impl fmt::Display for ContactId {
243243

244244
/// Allow converting [`ContactId`] to an SQLite type.
245245
impl rusqlite::types::ToSql for ContactId {
246-
fn to_sql(&self) -> rusqlite::Result<rusqlite::types::ToSqlOutput> {
246+
fn to_sql(&self) -> rusqlite::Result<rusqlite::types::ToSqlOutput<'_>> {
247247
let val = rusqlite::types::Value::Integer(i64::from(self.0));
248248
let out = rusqlite::types::ToSqlOutput::Owned(val);
249249
Ok(out)

‎src/ephemeral.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ impl FromStr for Timer {
146146
}
147147

148148
impl rusqlite::types::ToSql for Timer {
149-
fn to_sql(&self) -> rusqlite::Result<rusqlite::types::ToSqlOutput> {
149+
fn to_sql(&self) -> rusqlite::Result<rusqlite::types::ToSqlOutput<'_>> {
150150
let val = rusqlite::types::Value::Integer(match self {
151151
Self::Disabled => 0,
152152
Self::Enabled { duration } => i64::from(*duration),

‎src/headerdef.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,14 +134,14 @@ pub trait HeaderDefMap {
134134
fn get_header_value(&self, headerdef: HeaderDef) -> Option<String>;
135135

136136
/// Returns requested header if it exists.
137-
fn get_header(&self, headerdef: HeaderDef) -> Option<&MailHeader>;
137+
fn get_header(&self, headerdef: HeaderDef) -> Option<&MailHeader<'_>>;
138138
}
139139

140140
impl HeaderDefMap for [MailHeader<'_>] {
141141
fn get_header_value(&self, headerdef: HeaderDef) -> Option<String> {
142142
self.get_first_value(headerdef.get_headername())
143143
}
144-
fn get_header(&self, headerdef: HeaderDef) -> Option<&MailHeader> {
144+
fn get_header(&self, headerdef: HeaderDef) -> Option<&MailHeader<'_>> {
145145
self.get_first_header(headerdef.get_headername())
146146
}
147147
}

‎src/imap.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2163,7 +2163,7 @@ pub(crate) fn get_folder_meaning(folder: &Name) -> FolderMeaning {
21632163
}
21642164

21652165
/// Parses the headers from the FETCH result.
2166-
fn get_fetch_headers(prefetch_msg: &Fetch) -> Result<Vec<mailparse::MailHeader>> {
2166+
fn get_fetch_headers(prefetch_msg: &Fetch) -> Result<Vec<mailparse::MailHeader<'_>>> {
21672167
match prefetch_msg.header() {
21682168
Some(header_bytes) => {
21692169
let (headers, _) = mailparse::parse_headers(header_bytes)?;

0 commit comments

Comments
 (0)