Deuxfleurs/garage
44
56
Fork 73
Code Issues 100 Pull requests 14 Releases 30 Wiki Activity

Fix indent again

Browse source
This commit is contained in:
Quentin 2020-11-10 15:40:33 +01:00
parent 8797eed0ab
commit ab62c59acb
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/web/web_server.rs
View file

@ -73,9 +73,12 @@ fn authority_to_host(authority: &str) -> Result<&str, Error> {
let split = match iter.next() { let split = match iter.next() {
Some((_, '[')) => { Some((_, '[')) => {
let mut niter = iter.skip_while(|(_, c)| c != &']'); let mut niter = iter.skip_while(|(_, c)| c != &']');
niter.next().ok_or(Error::BadRequest(format!("Authority {} has an illegal format", authority)))?; niter.next().ok_or(Error::BadRequest(format!(
"Authority {} has an illegal format",
authority
)))?;
niter.next() niter.next()
}, }
Some((_, _)) => iter.skip_while(|(_, c)| c != &':').next(), Some((_, _)) => iter.skip_while(|(_, c)| c != &':').next(),
None => return Err(Error::BadRequest(format!("Authority is empty"))), None => return Err(Error::BadRequest(format!("Authority is empty"))),
}; };
@ -83,11 +86,13 @@ fn authority_to_host(authority: &str) -> Result<&str, Error> {
match split { match split {
Some((i, ':')) => Ok(&authority[..i]), Some((i, ':')) => Ok(&authority[..i]),
None => Ok(authority), None => Ok(authority),
Some((_, _)) => Err(Error::BadRequest(format!("Authority {} has an illegal format", authority))), Some((_, _)) => Err(Error::BadRequest(format!(
"Authority {} has an illegal format",
authority
))),
} }
} }
fn host_to_bucket<'a>(host: &'a str, root: &str) -> &'a str { fn host_to_bucket<'a>(host: &'a str, root: &str) -> &'a str {
if root.len() >= host.len() || !host.ends_with(root) { if root.len() >= host.len() || !host.ends_with(root) {
return host; return host;