Skip to content

Commit 525726d

Browse files
committed
PR comments (small nits) fixed
1 parent f3238db commit 525726d

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

examples/server.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@ use async_std::io::{self, Read, Write};
77
use async_std::net::{self, TcpStream};
88
use async_std::prelude::*;
99
use async_std::task::{self, Context, Poll};
10-
use http_types::{
11-
headers::{HeaderName, HeaderValue},
12-
Response, StatusCode,
13-
};
10+
use http_types::headers::{HeaderName, HeaderValue};
11+
use http_types::{Response, StatusCode};
1412

1513
async fn accept(addr: String, stream: TcpStream) -> Result<(), async_h1::Exception> {
1614
// println!("starting new connection from {}", stream.peer_addr()?);

src/client.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,9 @@ where
113113
use std::convert::TryFrom;
114114
let mut res = Response::new(StatusCode::try_from(code)?);
115115
for header in httparse_res.headers.iter() {
116-
res.insert_header(
117-
HeaderName::from_str(header.name)?,
118-
HeaderValue::from_str(std::str::from_utf8(header.value)?)?,
119-
)?;
116+
let name = HeaderName::from_str(header.name)?;
117+
let value = HeaderValue::from_str(std::str::from_utf8(header.value)?)?;
118+
res.insert_header(name, value)?;
120119
}
121120

122121
// Process the body if `Content-Length` was passed.

src/server.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -386,16 +386,17 @@ where
386386
let method = httparse_req.method.ok_or_else(|| "No method found")?;
387387
let uri = httparse_req.path.ok_or_else(|| "No uri found")?;
388388
let uri = url::Url::parse(&format!("{}{}", addr, uri))?;
389+
389390
let version = httparse_req.version.ok_or_else(|| "No version found")?;
390391
if version != HTTP_1_1_VERSION {
391392
return Err("Unsupported HTTP version".into());
392393
}
394+
393395
let mut req = Request::new(Method::from_str(method)?, uri);
394396
for header in httparse_req.headers.iter() {
395-
req.insert_header(
396-
HeaderName::from_str(header.name)?,
397-
HeaderValue::from_str(std::str::from_utf8(header.value)?)?,
398-
)?;
397+
let name = HeaderName::from_str(header.name)?;
398+
let value = HeaderValue::from_str(std::str::from_utf8(header.value)?)?;
399+
req.insert_header(name, value)?;
399400
}
400401

401402
// Check for content-length, that determines determines whether we can parse
@@ -406,6 +407,7 @@ where
406407
};
407408
req.set_body(Body::from_reader(reader));
408409
req.set_len(len);
410+
409411
Ok(Some(DecodedRequest::WithBody(req)))
410412
}
411413

0 commit comments

Comments
 (0)