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

Simplify regex set creation

This commit is contained in:
Matt Gathu 2020-10-18 07:27:37 +02:00
parent c7e794ab89
commit be9c5fdc51
No known key found for this signature in database
GPG Key ID: 7DAD4895E291CE56
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -91,7 +91,7 @@ log = "0.4"
mime = "0.3" mime = "0.3"
socket2 = "0.3" socket2 = "0.3"
pin-project = "0.4.17" pin-project = "0.4.17"
regex = "1.3" regex = "1.4"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0" serde_json = "1.0"
serde_urlencoded = "0.6.1" serde_urlencoded = "0.6.1"

6
src/middleware/logger.rs
View File

@ -101,7 +101,7 @@ impl Logger {
Logger(Rc::new(Inner { Logger(Rc::new(Inner {
format: Format::new(format), format: Format::new(format),
exclude: HashSet::new(), exclude: HashSet::new(),
exclude_regex: RegexSet::new(Vec::<&str>::new()).unwrap(), exclude_regex: RegexSet::empty(),
})) }))
} }
@ -120,7 +120,7 @@ impl Logger {
path: T, path: T,
) -> Result<Self, regex::Error> { ) -> Result<Self, regex::Error> {
let inner = Rc::get_mut(&mut self.0).unwrap(); let inner = Rc::get_mut(&mut self.0).unwrap();
let mut patterns: Vec<String> = inner.exclude_regex.patterns().into(); let mut patterns = inner.exclude_regex.patterns().to_vec();
patterns.push(path.into()); patterns.push(path.into());
let regex_set = RegexSet::new(patterns)?; let regex_set = RegexSet::new(patterns)?;
inner.exclude_regex = regex_set; inner.exclude_regex = regex_set;
@ -138,7 +138,7 @@ impl Default for Logger {
Logger(Rc::new(Inner { Logger(Rc::new(Inner {
format: Format::default(), format: Format::default(),
exclude: HashSet::new(), exclude: HashSet::new(),
exclude_regex: RegexSet::new(Vec::<&str>::new()).unwrap(), exclude_regex: RegexSet::empty(),
})) }))
} }
} }