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

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)