aquatic http: use serde_bencode for deserialization

bendy seems not to manage lack of trailing newline
This commit is contained in:
Joakim Frostegård 2020-08-12 04:26:09 +02:00
parent 7a96313173
commit bc5cd90371
3 changed files with 15 additions and 3 deletions

11
Cargo.lock generated
View file

@ -117,6 +117,7 @@ dependencies = [
"quickcheck_macros",
"rand",
"serde",
"serde_bencode",
"smartstring",
"urlencoding",
]
@ -1579,6 +1580,16 @@ dependencies = [
"serde_derive",
]
[[package]]
name = "serde_bencode"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "008b9167b9bfe7b1a0bc0fd30ffd4447c1525872c746b8540e08d88ab6dbcc13"
dependencies = [
"serde",
"serde_bytes",
]
[[package]]
name = "serde_bytes"
version = "0.11.5"

View file

@ -25,7 +25,6 @@ harness = false
[dependencies]
anyhow = "1"
bendy = { version = "0.3", features = ["std", "serde"] }
hashbrown = "0.8"
hex = { version = "0.4", default-features = false }
httparse = "1"
@ -34,10 +33,12 @@ log = "0.4"
memchr = "2"
rand = { version = "0.7", features = ["small_rng"] }
serde = { version = "1", features = ["derive"] }
serde_bencode = "0.2"
smartstring = "0.2"
urlencoding = "1"
[dev-dependencies]
bendy = { version = "0.3", features = ["std", "serde"] }
criterion = "0.3"
quickcheck = "0.9"
quickcheck_macros = "0.9"

View file

@ -184,8 +184,8 @@ impl Response {
Response::Scrape(r) => r.write(output),
}
}
pub fn from_bytes(bytes: &[u8]) -> Result<Self, ::bendy::serde::Error> {
::bendy::serde::de::from_bytes(bytes)
pub fn from_bytes(bytes: &[u8]) -> Result<Self, ::serde_bencode::Error> {
::serde_bencode::from_bytes(bytes)
}
}