berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Small clean-up suggestion on normalize code

This commit is contained in:
Thales Fragoso 2021-06-04 16:16:11 -03:00
parent 5506fd3c86
commit 507911b0c2
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/middleware/normalize.rs
View File

@ -143,7 +143,7 @@ where
// Either adds a string to the end (duplicates will be removed anyways) or trims all // Either adds a string to the end (duplicates will be removed anyways) or trims all
// slashes from the end // slashes from the end
let path = match self.trailing_slash_behavior { let path = match self.trailing_slash_behavior {
TrailingSlash::Always => original_path.to_string() + "/", TrailingSlash::Always => format!("{}/", original_path),
TrailingSlash::MergeOnly => original_path.to_string(), TrailingSlash::MergeOnly => original_path.to_string(),
TrailingSlash::Trim => original_path.trim_end_matches('/').to_string(), TrailingSlash::Trim => original_path.trim_end_matches('/').to_string(),
}; };
@ -170,10 +170,9 @@ where
let mut parts = head.uri.clone().into_parts(); let mut parts = head.uri.clone().into_parts();
let query = parts.path_and_query.as_ref().and_then(|pq| pq.query()); let query = parts.path_and_query.as_ref().and_then(|pq| pq.query());
let path = if let Some(q) = query { let path = match query {
Bytes::from(format!("{}?{}", path, q)) Some(q) => Bytes::from(format!("{}?{}", path, q)),
} else { None => Bytes::copy_from_slice(path.as_bytes()),
Bytes::copy_from_slice(path.as_bytes())
}; };
parts.path_and_query = Some(PathAndQuery::from_maybe_shared(path).unwrap()); parts.path_and_query = Some(PathAndQuery::from_maybe_shared(path).unwrap());