Skip to content

Commit 29a4a47

Browse files
kaizoplantkaizoplant
committed
clippy fixes
1 parent eb2c8fe commit 29a4a47

File tree

4 files changed

+24
-25
lines changed

4 files changed

+24
-25
lines changed

‎src/base.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2026,7 +2026,7 @@ fn complete_msgbar(text: &EditRope, cursor: &mut Cursor, store: &ChatStore) -> V
20262026
// Complete Emoji shortcodes.
20272027
Some(':') => {
20282028
let list = store.emojis.complete(&id[1..]);
2029-
let iter = list.into_iter().take(200).map(|s| format!(":{}:", s));
2029+
let iter = list.into_iter().take(200).map(|s| format!(":{s}:"));
20302030

20312031
return iter.collect();
20322032
},
@@ -2169,7 +2169,7 @@ pub mod tests {
21692169
));
21702170

21712171
for i in 0..3 {
2172-
let event_id = format!("$house_{}", i);
2172+
let event_id = format!("$house_{i}");
21732173
info.insert_reaction(MessageLikeEvent::Original(
21742174
matrix_sdk::ruma::events::OriginalMessageLikeEvent {
21752175
content: content.clone(),
@@ -2188,7 +2188,7 @@ pub mod tests {
21882188
));
21892189

21902190
for i in 0..2 {
2191-
let event_id = format!("$smile_{}", i);
2191+
let event_id = format!("$smile_{i}");
21922192
info.insert_reaction(MessageLikeEvent::Original(
21932193
matrix_sdk::ruma::events::OriginalMessageLikeEvent {
21942194
content: content.clone(),
@@ -2202,7 +2202,7 @@ pub mod tests {
22022202
}
22032203

22042204
for i in 2..4 {
2205-
let event_id = format!("$smile_{}", i);
2205+
let event_id = format!("$smile_{i}");
22062206
info.insert_reaction(MessageLikeEvent::Original(
22072207
matrix_sdk::ruma::events::OriginalMessageLikeEvent {
22082208
content: content.clone(),

‎src/config.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,7 @@ impl ApplicationSettings {
904904
profiles
905905
.keys()
906906
.enumerate()
907-
.for_each(|(i, name)| println!("{}: {}", i, name));
907+
.for_each(|(i, name)| println!("{i}: {name}"));
908908

909909
print!("Select a number or 'q' to quit: ");
910910
let _ = std::io::stdout().flush();

‎src/message/state.rs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,11 @@ pub fn body_cow_state(ev: &AnySyncStateEvent) -> Cow<'static, str> {
121121

122122
match (old_canon, new_canon) {
123123
(None, Some(canon)) => {
124-
format!("* updated the canonical alias for the room to: {}", canon)
124+
format!("* updated the canonical alias for the room to: {canon}")
125125
},
126126
(Some(old), Some(new)) => {
127127
if old != new {
128-
format!("* updated the canonical alias for the room to: {}", new)
128+
format!("* updated the canonical alias for the room to: {new}")
129129
} else {
130130
return Cow::Borrowed("* removed the canonical alias for the room");
131131
}
@@ -187,10 +187,10 @@ pub fn body_cow_state(ev: &AnySyncStateEvent) -> Cow<'static, str> {
187187

188188
match change {
189189
MembershipChange::None => {
190-
format!("* did nothing to {}", state_key)
190+
format!("* did nothing to {state_key}")
191191
},
192192
MembershipChange::Error => {
193-
format!("* failed to calculate membership change to {}", state_key)
193+
format!("* failed to calculate membership change to {state_key}")
194194
},
195195
MembershipChange::Joined => {
196196
return Cow::Borrowed("* joined the room");
@@ -199,19 +199,19 @@ pub fn body_cow_state(ev: &AnySyncStateEvent) -> Cow<'static, str> {
199199
return Cow::Borrowed("* left the room");
200200
},
201201
MembershipChange::Banned => {
202-
format!("* banned {} from the room", state_key)
202+
format!("* banned {state_key} from the room")
203203
},
204204
MembershipChange::Unbanned => {
205-
format!("* unbanned {} from the room", state_key)
205+
format!("* unbanned {state_key} from the room")
206206
},
207207
MembershipChange::Kicked => {
208-
format!("* kicked {} from the room", state_key)
208+
format!("* kicked {state_key} from the room")
209209
},
210210
MembershipChange::Invited => {
211-
format!("* invited {} to the room", state_key)
211+
format!("* invited {state_key} to the room")
212212
},
213213
MembershipChange::KickedAndBanned => {
214-
format!("* kicked and banned {} from the room", state_key)
214+
format!("* kicked and banned {state_key} from the room")
215215
},
216216
MembershipChange::InvitationAccepted => {
217217
return Cow::Borrowed("* accepted an invitation to join the room");
@@ -220,26 +220,26 @@ pub fn body_cow_state(ev: &AnySyncStateEvent) -> Cow<'static, str> {
220220
return Cow::Borrowed("* rejected an invitation to join the room");
221221
},
222222
MembershipChange::InvitationRevoked => {
223-
format!("* revoked an invitation for {} to join the room", state_key)
223+
format!("* revoked an invitation for {state_key} to join the room")
224224
},
225225
MembershipChange::Knocked => {
226226
return Cow::Borrowed("* would like to join the room");
227227
},
228228
MembershipChange::KnockAccepted => {
229-
format!("* accepted the room knock from {}", state_key)
229+
format!("* accepted the room knock from {state_key}")
230230
},
231231
MembershipChange::KnockRetracted => {
232232
return Cow::Borrowed("* retracted their room knock");
233233
},
234234
MembershipChange::KnockDenied => {
235-
format!("* rejected the room knock from {}", state_key)
235+
format!("* rejected the room knock from {state_key}")
236236
},
237237
MembershipChange::ProfileChanged { displayname_change, avatar_url_change } => {
238238
match (displayname_change, avatar_url_change) {
239239
(Some(change), avatar_change) => {
240240
let mut m = match (change.old, change.new) {
241241
(None, Some(new)) => {
242-
format!("* set their display name to {:?}", new)
242+
format!("* set their display name to {new:?}")
243243
},
244244
(Some(old), Some(new)) => {
245245
format!("* changed their display name from {old} to {new}")
@@ -280,7 +280,7 @@ pub fn body_cow_state(ev: &AnySyncStateEvent) -> Cow<'static, str> {
280280
}
281281
},
282282
ev => {
283-
format!("* made an unknown membership change to {}: {:?}", state_key, ev)
283+
format!("* made an unknown membership change to {state_key}: {ev:?}")
284284
},
285285
}
286286
},
@@ -727,7 +727,7 @@ pub fn html_state(ev: &AnySyncStateEvent) -> StyleTree {
727727
ev => {
728728
let prefix =
729729
StyleTreeNode::Text("* made an unknown membership change to ".into());
730-
let suffix = StyleTreeNode::Text(format!(": {:?}", ev).into());
730+
let suffix = StyleTreeNode::Text(format!(": {ev:?}").into());
731731
vec![prefix, user_id, suffix]
732732
},
733733
}

‎src/windows/room/chat.rs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -271,9 +271,9 @@ impl ChatState {
271271
let mut filename_incr = filename.clone();
272272
for n in 1..=1000 {
273273
if let Some(ext) = ext.and_then(OsStr::to_str) {
274-
filename_incr.set_file_name(format!("{}-{}.{}", stem, n, ext));
274+
filename_incr.set_file_name(format!("{stem}-{n}.{ext}"));
275275
} else {
276-
filename_incr.set_file_name(format!("{}-{}", stem, n));
276+
filename_incr.set_file_name(format!("{stem}-{n}"));
277277
}
278278

279279
if !filename_incr.exists() {
@@ -400,7 +400,7 @@ impl ChatState {
400400
};
401401

402402
if info.user_reactions_contains(&settings.profile.user_id, &event_id, &emoji) {
403-
let msg = format!("You’ve already reacted to this message with {}", emoji);
403+
let msg = format!("You’ve already reacted to this message with {emoji}");
404404
let err = UIError::Failure(msg);
405405

406406
return Err(err);
@@ -613,8 +613,7 @@ impl ChatState {
613613
let mut buff = std::io::Cursor::new(bytes);
614614
dynimage.write_to(&mut buff, image::ImageFormat::Png)?;
615615
Ok(buff.into_inner())
616-
})
617-
.map_err(IambError::from)?;
616+
})?;
618617
let mime = mime::IMAGE_PNG;
619618

620619
let name = "Clipboard.png";

0 commit comments

Comments
 (0)