youwen/iamb
1
0
Fork 0
mirror of https://github.com/youwen5/iamb.git synced 2025-06-19 21:29:52 -07:00
Code Issues Projects Releases Packages Wiki Activity

Fix newer Clippy warnings for 1.67.0 (#33)

Browse source
This commit is contained in:
Ulyssa 2023-01-30 13:51:32 -08:00
parent fd72cf5c4e
commit 3629f15e0d
No known key found for this signature in database
GPG key ID: 1B3965A3D18B9B64
8 changed files with 33 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/commands.rs
View file

@ -40,7 +40,7 @@ fn tag_name(name: String) -> Result<TagName, CommandError> {
if let Ok(tag) = name.parse() {
TagName::User(tag)
} else {
let msg = format!("Invalid user tag name: {}", name);
let msg = format!("Invalid user tag name: {name}");
return Err(CommandError::Error(msg));
}

8
src/main.rs
View file

@ -455,13 +455,13 @@ async fn login(worker: Requester, settings: &ApplicationSettings) -> IambResult<
match worker.login(LoginStyle::Password(password)) {
Ok(info) => {
if let Some(msg) = info {
println!("{}", msg);
println!("{msg}");
}
break;
},
Err(err) => {
println!("Failed to login: {}", err);
println!("Failed to login: {err}");
continue;
},
}
@ -471,7 +471,7 @@ async fn login(worker: Requester, settings: &ApplicationSettings) -> IambResult<
}
fn print_exit<T: Display, N>(v: T) -> N {
println!("{}", v);
println!("{v}");
process::exit(2);
}
@ -532,7 +532,7 @@ fn main() -> IambResult<()> {
.thread_name_fn(|| {
static ATOMIC_ID: AtomicUsize = AtomicUsize::new(0);
let id = ATOMIC_ID.fetch_add(1, Ordering::SeqCst);
format!("iamb-worker-{}", id)
format!("iamb-worker-{id}")
})
.build()
.unwrap();

4
src/message/mod.rs
View file

@ -134,7 +134,7 @@ impl MessageTimeStamp {
match self {
MessageTimeStamp::OriginServer(ms) => {
let time = millis_to_datetime(*ms).format("%T");
let time = format!(" [{}]", time);
let time = format!(" [{time}]");
Span::raw(time).into()
},
@ -343,7 +343,7 @@ impl MessageEvent {
.and_then(|r| r.content.reason.as_ref());
if let Some(r) = reason {
Cow::Owned(format!("[Redacted: {:?}]", r))
Cow::Owned(format!("[Redacted: {r:?}]"))
} else {
Cow::Borrowed("[Redacted]")
}

8
src/windows/mod.rs
View file

@ -168,7 +168,7 @@ fn append_tags<'a>(tags: &'a Tags, spans: &mut Vec<Span<'a>>, style: Style) {
spans.push(Span::styled("User Tag: ", style));
spans.push(Span::styled(tag.as_ref(), style));
},
tag => spans.push(Span::styled(format!("{:?}", tag), style)),
tag => spans.push(Span::styled(format!("{tag:?}"), style)),
}
}
@ -594,7 +594,7 @@ impl Window<IambInfo> for IambWindow {
}
fn posn(index: usize, _: &mut ProgramStore) -> IambResult<Self> {
let msg = format!("Cannot find indexed buffer (index = {})", index);
let msg = format!("Cannot find indexed buffer (index = {index})");
let err = UIError::Unimplemented(msg);
Err(err)
@ -852,7 +852,7 @@ impl VerifyItem {
let device = self.sasv1.other_device();
if let Some(display_name) = device.display_name() {
format!("Device verification with {} ({})", display_name, state)
format!("Device verification with {display_name} ({state})")
} else {
format!("Device verification with device {} ({})", device.device_id(), state)
}
@ -958,7 +958,7 @@ impl ListItem<IambInfo> for VerifyItem {
lines.push(Spans::from(""));
for line in format_emojis(emoji).lines() {
lines.push(Spans::from(format!(" {}", line)));
lines.push(Spans::from(format!(" {line}")));
}
lines.push(Spans::from(""));

2
src/windows/room/chat.rs
View file

@ -383,7 +383,7 @@ impl ChatState {
.map_err(IambError::from)?;
// Mock up the local echo message for the scrollback.
let msg = TextMessageEventContent::plain(format!("[Attached File: {}]", name));
let msg = TextMessageEventContent::plain(format!("[Attached File: {name}]"));
let msg = MessageType::Text(msg);
let msg = RoomMessageEventContent::new(msg);

5
src/windows/room/mod.rs
View file

@ -132,10 +132,7 @@ impl RoomState {
None => format!("{:?}", store.application.get_room_title(self.id())),
};
let mut invited = vec![Span::from(format!(
"You have been invited to join {}",
name
))];
let mut invited = vec![Span::from(format!("You have been invited to join {name}"))];
if let Ok(Some(inviter)) = &inviter {
invited.push(Span::from(" by "));

12
src/windows/room/scrollback.rs
View file

@ -615,7 +615,7 @@ impl EditorActions<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
},
_ => {
let msg = format!("Unknown editing target: {:?}", motion);
let msg = format!("Unknown editing target: {motion:?}");
let err = EditError::Unimplemented(msg);
return Err(err);
@ -702,7 +702,7 @@ impl EditorActions<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
},
_ => {
let msg = format!("Unknown motion: {:?}", motion);
let msg = format!("Unknown motion: {motion:?}");
let err = EditError::Unimplemented(msg);
return Err(err);
@ -790,7 +790,7 @@ impl EditorActions<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
HistoryAction::Checkpoint => Ok(None),
HistoryAction::Undo(_) => Err(EditError::Failure("Nothing to undo".into())),
HistoryAction::Redo(_) => Err(EditError::Failure("Nothing to redo".into())),
_ => Err(EditError::Unimplemented(format!("Unknown action: {:?}", act))),
_ => Err(EditError::Unimplemented(format!("Unknown action: {act:?}"))),
}
}
@ -847,7 +847,7 @@ impl EditorActions<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
Ok(None)
},
_ => Err(EditError::Unimplemented(format!("Unknown action: {:?}", act))),
_ => Err(EditError::Unimplemented(format!("Unknown action: {act:?}"))),
}
}
}
@ -874,7 +874,7 @@ impl Editable<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
Err(err)
},
_ => Err(EditError::Unimplemented(format!("Unknown action: {:?}", act))),
_ => Err(EditError::Unimplemented(format!("Unknown action: {act:?}"))),
}
}
}
@ -973,7 +973,7 @@ impl Promptable<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
return Err(err);
},
_ => {
let msg = format!("Messages scrollback doesn't support {:?}", act);
let msg = format!("Messages scrollback doesn't support {act:?}");
let err = EditError::Unimplemented(msg);
return Err(err);

20
src/worker.rs
View file

@ -350,6 +350,7 @@ pub struct ClientWorker {
settings: ApplicationSettings,
client: Client,
sync_handle: Option<JoinHandle<()>>,
rcpt_handle: Option<JoinHandle<()>>,
}
impl ClientWorker {
@ -388,9 +389,10 @@ impl ClientWorker {
settings,
client: client.clone(),
sync_handle: None,
rcpt_handle: None,
};
let _ = tokio::spawn(async move {
tokio::spawn(async move {
worker.work(rx).await;
});
@ -412,6 +414,10 @@ impl ClientWorker {
if let Some(handle) = self.sync_handle.take() {
handle.abort();
}
if let Some(handle) = self.rcpt_handle.take() {
handle.abort();
}
}
async fn run(&mut self, task: WorkerTask) {
@ -685,7 +691,8 @@ impl ClientWorker {
);
let client = self.client.clone();
let _ = tokio::spawn(async move {
self.rcpt_handle = tokio::spawn(async move {
// Update the displayed read receipts ever 5 seconds.
let mut interval = tokio::time::interval(Duration::from_secs(5));
@ -695,7 +702,8 @@ impl ClientWorker {
let receipts = update_receipts(&client).await;
store.lock().await.application.set_receipts(receipts).await;
}
});
})
.into();
self.initialized = true;
}
@ -762,7 +770,7 @@ impl ClientWorker {
"Failed to create direct message room"
);
let msg = format!("Could not open a room with {}", user);
let msg = format!("Could not open a room with {user}");
let err = UIError::Failure(msg);
Err(err)
@ -1007,12 +1015,12 @@ impl ClientWorker {
let methods = vec![VerificationMethod::SasV1];
let request = identity.request_verification_with_methods(methods);
let _req = request.await.map_err(IambError::from)?;
let info = format!("Sent verification request to {}", user_id);
let info = format!("Sent verification request to {user_id}");
Ok(InfoMessage::from(info).into())
},
None => {
let msg = format!("Could not find identity information for {}", user_id);
let msg = format!("Could not find identity information for {user_id}");
let err = UIError::Failure(msg);
Err(err)