eliott/libsignal
1
0
Fork 0
mirror of https://github.com/signalapp/libsignal.git synced 2026-04-25 17:25:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

net: Remove explicit Drop for ws::Chat, it no longer adds anything

Browse Source
This commit is contained in:
Jordan Rose
2026-03-24 17:46:20 -07:00
parent e3d9c09bec
commit 7ca4f738fb
1 changed files with 23 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
rust/net/src/chat/ws.rs
View File

@@ -295,7 +295,29 @@ impl Chat {
/// progress might succeed or fail, depending on the timing of sending and
/// receiving requests and responses.
pub async fn disconnect(&self) {
self.state.lock().await.disconnect()
let mut guard = self.state.lock().await;
// Take the existing state and leave a cheap-to-construct temporary
// state there.
let state = std::mem::replace(
&mut *guard,
TaskState::Finished(Ok(FinishReason::LocalDisconnect)),
);
*guard = match state {
TaskState::MaybeStillRunning {
request_tx,
response_tx,
task,
shared_h2_connection: _,
} => {
// Signal to the task, if it's still running, that it should
// quit. Do this by hanging up on it, at which point it will
// exit.
drop((request_tx, response_tx));
TaskState::SignaledToEnd(task)
}
state @ (TaskState::SignaledToEnd(_) | TaskState::Finished(_)) => state,
};
}
/// Returns `true` if the websocket is known to be connected.
@@ -409,35 +431,6 @@ impl Chat {
}
}
impl TaskState {
fn disconnect(&mut self) {
// Take the existing state and leave a cheap-to-construct temporary
// state there.
let state = std::mem::replace(self, TaskState::Finished(Ok(FinishReason::LocalDisconnect)));
*self = match state {
TaskState::MaybeStillRunning {
request_tx,
response_tx,
task,
shared_h2_connection: _,
} => {
// Signal to the task, if it's still running, that it should
// quit. Do this by hanging up on it, at which point it will
// exit.
drop((request_tx, response_tx));
TaskState::SignaledToEnd(task)
}
state @ (TaskState::SignaledToEnd(_) | TaskState::Finished(_)) => state,
};
}
}
impl Drop for Chat {
fn drop(&mut self) {
self.state.get_mut().disconnect();
}
}
impl Responder {
/// Sends a response for the associated request to the server.
///