Skip to content

Commit f633fb5

Browse files
committed
Some useless todos fixed
1 parent c7b286f commit f633fb5

File tree

2 files changed

+18
-9
lines changed

2 files changed

+18
-9
lines changed

httpbis/src/client/conn.rs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -124,15 +124,9 @@ pub(crate) enum ClientToWriteMessage {
124124
impl ErrorAwareDrop for ClientToWriteMessage {
125125
fn drop_with_error(self, error: crate::Error) {
126126
match self {
127-
ClientToWriteMessage::Start(start) => {
128-
start.start.stream_handler.error(error);
129-
}
130-
ClientToWriteMessage::WaitForHandshake(wait) => {
131-
let _ = wait.send(Err(error));
132-
}
133-
ClientToWriteMessage::Common(_) => {
134-
// TODO: error
135-
}
127+
ClientToWriteMessage::Start(start) => start.start.stream_handler.error(error),
128+
ClientToWriteMessage::WaitForHandshake(wait) => drop(wait.send(Err(error))),
129+
ClientToWriteMessage::Common(common) => common.drop_with_error(error),
136130
}
137131
}
138132
}

httpbis/src/common/conn_write.rs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,11 @@ use crate::solicit::frame::RstStreamFrame;
2929
use crate::solicit::frame::SettingsFrame;
3030
use crate::solicit::stream_id::StreamId;
3131
use crate::DataOrTrailers;
32+
use crate::Error;
3233
use crate::ErrorCode;
3334
use crate::Headers;
3435

36+
use crate::death::channel::ErrorAwareDrop;
3537
use crate::death::error_holder::ConnDiedType;
3638
use crate::death::oneshot::DeathAwareOneshotSender;
3739
use crate::solicit_async::TryStreamBox;
@@ -293,6 +295,19 @@ pub(crate) enum CommonToWriteMessage {
293295
DumpState(DeathAwareOneshotSender<ConnStateSnapshot, ConnDiedType>),
294296
}
295297

298+
impl ErrorAwareDrop for CommonToWriteMessage {
299+
fn drop_with_error(self, error: Error) {
300+
let _ = error;
301+
match self {
302+
CommonToWriteMessage::IncreaseInWindow(_, _) => {}
303+
CommonToWriteMessage::StreamEnqueue(_, _) => {}
304+
CommonToWriteMessage::StreamEnd(_, _) => {}
305+
CommonToWriteMessage::Pull(_, _, _) => {}
306+
CommonToWriteMessage::DumpState(_) => {}
307+
}
308+
}
309+
}
310+
296311
impl fmt::Debug for CommonToWriteMessage {
297312
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
298313
f.debug_tuple("CommonToWriteMessage").field(&"...").finish()

0 commit comments

Comments
 (0)