actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2025-07-01 16:55:08 +02:00
Code Issues Releases Wiki Activity

Run rustfmt

Browse Source
This commit is contained in:
Yuki Okushi
2020-05-21 17:56:53 +09:00
parent fe89ba7027
commit 6dd78d9355
6 changed files with 45 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/middleware/logger.rs
View File

@ -273,13 +273,15 @@ impl<B> PinnedDrop for StreamLog<B> {
}
}
impl<B: MessageBody> MessageBody for StreamLog<B> {
fn size(&self) -> BodySize {
self.body.size()
}
fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Result<Bytes, Error>>> {
fn poll_next(
self: Pin<&mut Self>,
cx: &mut Context<'_>,
) -> Poll<Option<Result<Bytes, Error>>> {
let this = self.project();
match this.body.poll_next(cx) {
Poll::Ready(Some(Ok(chunk))) => {
@ -324,11 +326,13 @@ impl Format {
if let Some(key) = cap.get(2) {
results.push(match cap.get(3).unwrap().as_str() {
"a" => if key.as_str() == "r" {
FormatText::RealIPRemoteAddr
} else {
unreachable!()
},
"a" => {
if key.as_str() == "r" {
FormatText::RealIPRemoteAddr
} else {
unreachable!()
}
}
"i" => FormatText::RequestHeader(
HeaderName::try_from(key.as_str()).unwrap(),
),
@ -481,7 +485,8 @@ impl FormatText {
*self = s;
}
FormatText::RealIPRemoteAddr => {
let s = if let Some(remote) = req.connection_info().realip_remote_addr() {
let s = if let Some(remote) = req.connection_info().realip_remote_addr()
{
FormatText::Str(remote.to_string())
} else {
FormatText::Str("-".to_string())
@ -630,7 +635,9 @@ mod tests {
let req = TestRequest::with_header(
header::FORWARDED,
header::HeaderValue::from_static("for=192.0.2.60;proto=http;by=203.0.113.43"),
header::HeaderValue::from_static(
"for=192.0.2.60;proto=http;by=203.0.113.43",
),
)
.to_srv_request();

4
src/middleware/normalize.rs
View File

@ -74,7 +74,7 @@ where
fn call(&mut self, mut req: ServiceRequest) -> Self::Future {
let head = req.head_mut();
// always add trailing slash, might be an extra one
let path = head.uri.path().to_string() + "/";
let original_len = path.len();
@ -177,7 +177,7 @@ mod tests {
assert!(res.status().is_success());
}
#[actix_rt::test]
#[actix_rt::test]
async fn should_normalize_nothing_notrail() {
const URI: &str = "/v1/something";