Skip to content

Commit 4444461

Browse files
committed
Normalize enum names
1 parent e5f5500 commit 4444461

File tree

2 files changed

+16
-10
lines changed

2 files changed

+16
-10
lines changed

src/chunked/encoder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const CRLF_LEN: usize = 2;
1212
/// The encoder state.
1313
#[derive(Debug)]
1414
enum State {
15-
/// Initing state.
15+
/// Starting state.
1616
Init,
1717
/// Streaming out chunks.
1818
EncodeChunks,

src/server/encode.rs

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,17 @@ pub(crate) struct Encoder {
3737

3838
#[derive(Debug)]
3939
enum State {
40+
/// Starting state.
4041
Init,
42+
/// Write the HEAD section to an intermediate buffer.
4143
ComputeHead,
44+
/// Stream out the HEAD section.
4245
EncodeHead,
43-
FixedBody,
44-
ChunkedBody,
46+
/// Stream out a body whose length is known ahead of time.
47+
EncodeFixedBody,
48+
/// Stream out a body whose length is *not* know ahead of time.
49+
EncodeChunkedBody,
50+
/// Stream has ended.
4551
End,
4652
}
4753

@@ -70,8 +76,8 @@ impl Encoder {
7076
State::Init => self.init(cx, buf),
7177
State::ComputeHead => self.compute_head(cx, buf),
7278
State::EncodeHead => self.encode_head(cx, buf),
73-
State::FixedBody => self.encode_fixed_body(cx, buf),
74-
State::ChunkedBody => self.encode_chunked_body(cx, buf),
79+
State::EncodeFixedBody => self.encode_fixed_body(cx, buf),
80+
State::EncodeChunkedBody => self.encode_chunked_body(cx, buf),
7581
State::End => Poll::Ready(Ok(self.bytes_written)),
7682
};
7783
log::trace!("ServerEncoder {} bytes written", self.bytes_written);
@@ -87,9 +93,9 @@ impl Encoder {
8793
match self.state {
8894
Init => assert!(matches!(state, ComputeHead)),
8995
ComputeHead => assert!(matches!(state, EncodeHead)),
90-
EncodeHead => assert!(matches!(state, ChunkedBody | FixedBody)),
91-
FixedBody => assert!(matches!(state, End)),
92-
ChunkedBody => assert!(matches!(state, End)),
96+
EncodeHead => assert!(matches!(state, EncodeChunkedBody | EncodeFixedBody)),
97+
EncodeFixedBody => assert!(matches!(state, End)),
98+
EncodeChunkedBody => assert!(matches!(state, End)),
9399
End => panic!("No state transitions allowed after the stream has ended"),
94100
}
95101

@@ -158,12 +164,12 @@ impl Encoder {
158164
match self.res.len() {
159165
Some(body_len) => {
160166
self.body_len = body_len;
161-
self.state = State::FixedBody;
167+
self.state = State::EncodeFixedBody;
162168
log::trace!("Server response encoding: fixed length body");
163169
return self.encode_fixed_body(cx, buf);
164170
}
165171
None => {
166-
self.state = State::ChunkedBody;
172+
self.state = State::EncodeChunkedBody;
167173
log::trace!("Server response encoding: chunked body");
168174
return self.encode_chunked_body(cx, buf);
169175
}

0 commit comments

Comments
 (0)