forked/h2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: cargo fmt, clippy

Browse Source
This commit is contained in:
Gurwinder Singh
2019-08-17 09:07:32 +05:30
committed by Sean McArthur
parent e72d6dc189
commit f46840f3fa
43 changed files with 785 additions and 870 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
src/hpack/encoder.rs
View File

@@ -1,5 +1,5 @@
use super::{huffman, Header};
use super::table::{Index, Table};
use super::{huffman, Header};
use bytes::{BufMut, BytesMut};
use http::header::{HeaderName, HeaderValue};
@@ -47,27 +47,31 @@ impl Encoder {
#[allow(dead_code)]
pub fn update_max_size(&mut self, val: usize) {
match self.size_update {
Some(SizeUpdate::One(old)) => if val > old {
if old > self.table.max_size() {
Some(SizeUpdate::One(old)) => {
if val > old {
if old > self.table.max_size() {
self.size_update = Some(SizeUpdate::One(val));
} else {
self.size_update = Some(SizeUpdate::Two(old, val));
}
} else {
self.size_update = Some(SizeUpdate::One(val));
}
}
Some(SizeUpdate::Two(min, _)) => {
if val < min {
self.size_update = Some(SizeUpdate::One(val));
} else {
self.size_update = Some(SizeUpdate::Two(old, val));
self.size_update = Some(SizeUpdate::Two(min, val));
}
} else {
self.size_update = Some(SizeUpdate::One(val));
},
Some(SizeUpdate::Two(min, _)) => if val < min {
self.size_update = Some(SizeUpdate::One(val));
} else {
self.size_update = Some(SizeUpdate::Two(min, val));
},
}
None => {
if val != self.table.max_size() {
// Don't bother writing a frame if the value already matches
// the table's max size.
self.size_update = Some(SizeUpdate::One(val));
}
},
}
}
}
@@ -120,14 +124,11 @@ impl Encoder {
if res.is_err() {
dst.truncate(len);
return Encode::Partial(EncodeState {
index: index,
value: None,
});
return Encode::Partial(EncodeState { index, value: None });
}
last_index = Some(index);
},
}
// The header does not have an associated name. This means that
// the name is the same as the previously yielded header. In
// which case, we skip table lookup and just use the same index
@@ -148,7 +149,7 @@ impl Encoder {
value: Some(value),
});
}
},
}
};
}
@@ -160,14 +161,14 @@ impl Encoder {
Some(SizeUpdate::One(val)) => {
self.table.resize(val);
encode_size_update(val, dst)?;
},
}
Some(SizeUpdate::Two(min, max)) => {
self.table.resize(min);
self.table.resize(max);
encode_size_update(min, dst)?;
encode_size_update(max, dst)?;
},
None => {},
}
None => {}
}
Ok(())
@@ -177,12 +178,12 @@ impl Encoder {
match *index {
Index::Indexed(idx, _) => {
encode_int(idx, 7, 0x80, dst)?;
},
}
Index::Name(idx, _) => {
let header = self.table.resolve(&index);
encode_not_indexed(idx, header.value_slice(), header.is_sensitive(), dst)?;
},
}
Index::Inserted(_) => {
let header = self.table.resolve(&index);
@@ -192,19 +193,19 @@ impl Encoder {
return Err(EncoderError::BufferOverflow);
}
dst.put_u8(0b01000000);
dst.put_u8(0b0100_0000);
encode_str(header.name().as_slice(), dst)?;
encode_str(header.value_slice(), dst)?;
},
}
Index::InsertedValue(idx, _) => {
let header = self.table.resolve(&index);
assert!(!header.is_sensitive());
encode_int(idx, 6, 0b01000000, dst)?;
encode_int(idx, 6, 0b0100_0000, dst)?;
encode_str(header.value_slice(), dst)?;
},
}
Index::NotIndexed(_) => {
let header = self.table.resolve(&index);
@@ -214,7 +215,7 @@ impl Encoder {
header.is_sensitive(),
dst,
)?;
},
}
}
Ok(())
@@ -227,14 +228,14 @@ impl Encoder {
dst: &mut BytesMut,
) -> Result<(), EncoderError> {
match *last {
Index::Indexed(..) |
Index::Name(..) |
Index::Inserted(..) |
Index::InsertedValue(..) => {
Index::Indexed(..)
| Index::Name(..)
| Index::Inserted(..)
| Index::InsertedValue(..) => {
let idx = self.table.resolve_idx(last);
encode_not_indexed(idx, value.as_ref(), value.is_sensitive(), dst)?;
},
}
Index::NotIndexed(_) => {
let last = self.table.resolve(last);
@@ -244,7 +245,7 @@ impl Encoder {
value.is_sensitive(),
dst,
)?;
},
}
}
Ok(())
@@ -258,7 +259,7 @@ impl Default for Encoder {
}
fn encode_size_update<B: BufMut>(val: usize, dst: &mut B) -> Result<(), EncoderError> {
encode_int(val, 5, 0b00100000, dst)
encode_int(val, 5, 0b0010_0000, dst)
}
fn encode_not_indexed(
@@ -305,7 +306,7 @@ fn encode_str(val: &[u8], dst: &mut BytesMut) -> Result<(), EncoderError> {
return Err(EncoderError::BufferOverflow);
}
if val.len() != 0 {
if !val.is_empty() {
let idx = dst.len();
// Push a placeholder byte for the length header
@@ -378,7 +379,7 @@ fn encode_int<B: BufMut>(
value -= low;
if value > 0x0fffffff {
if value > 0x0fff_ffff {
panic!("value out of range");
}
@@ -390,10 +391,10 @@ fn encode_int<B: BufMut>(
return Err(EncoderError::BufferOverflow);
}
dst.put_u8(0b10000000 | value as u8);
dst.put_u8(0b1000_0000 | value as u8);
rem -= 1;
value = value >> 7;
value >>= 7;
}
if rem == 0 {
@@ -560,7 +561,7 @@ mod test {
let header = Header::Field {
name: Some(name),
value: value,
value,
};
// Now, try to encode the sensitive header
@@ -580,7 +581,7 @@ mod test {
let header = Header::Field {
name: Some(name),
value: value,
value,
};
let mut encoder = Encoder::default();
@@ -604,7 +605,7 @@ mod test {
let header = Header::Field {
name: Some(name),
value: value,
value,
};
let res = encode(&mut encoder, vec![header]);
@@ -808,7 +809,8 @@ mod test {
name: None,
value: HeaderValue::from_bytes(b"sup").unwrap(),
},
].into_iter();
]
.into_iter();
let resume = match encoder.encode(None, &mut input, &mut dst) {
Encode::Partial(r) => r,
@@ -823,7 +825,7 @@ mod test {
dst.clear();
match encoder.encode(Some(resume), &mut input, &mut dst) {
Encode::Full => {},
Encode::Full => {}
unexpected => panic!("resume returned unexpected: {:?}", unexpected),
}
@@ -856,7 +858,7 @@ mod test {
Header::Field {
name: Some(name),
value: value,
value,
}
}