From 14f9a22f4641ea214af1513bc1f9ef12b1350cbe Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 1 Feb 2021 09:16:14 +0100 Subject: fix(users/Profpatsch/netencode): decode U::Text directly into str MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since `Text` is a scalar, it doesn’t make sense to delay the utf-8 verification to the consumer. Change-Id: I36e4d228fbf35374d7c1addb4b24828cf6e927e5 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2478 Tested-by: BuildkiteCI Reviewed-by: Profpatsch --- users/Profpatsch/read-http.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'users/Profpatsch/read-http.rs') diff --git a/users/Profpatsch/read-http.rs b/users/Profpatsch/read-http.rs index de112f4c77..42d4f37ff6 100644 --- a/users/Profpatsch/read-http.rs +++ b/users/Profpatsch/read-http.rs @@ -128,8 +128,8 @@ fn main() -> std::io::Result<()> { fn write_dict_req<'buf>(method: &'buf str, path: &'buf str, headers: &[(String, &str)]) -> std::io::Result<()> { let mut http = vec![ - ("method", U::Text(method.as_bytes())), - ("path", U::Text(path.as_bytes())), + ("method", U::Text(method)), + ("path", U::Text(path)), ]; write_dict(http, headers) } @@ -137,7 +137,7 @@ fn write_dict_req<'buf>(method: &'buf str, path: &'buf str, headers: &[(String, fn write_dict_resp<'buf>(code: u16, reason: &'buf str, headers: &[(String, &str)]) -> std::io::Result<()> { let mut http = vec![ ("status", U::N6(code as u64)), - ("status-text", U::Text(reason.as_bytes())), + ("status-text", U::Text(reason)), ]; write_dict(http, headers) } @@ -147,7 +147,7 @@ fn write_dict<'buf, 'a>(mut http: Vec<(&str, U<'a>)>, headers: &'a[(String, &str http.push(("headers", U::Record( headers.iter().map( |(name, value)| - (name.as_str(), U::Text(value.as_bytes())) + (name.as_str(), U::Text(value)) ).collect::>() ))); -- cgit 1.4.1