kageru/advent-of-code
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

make regex static in 2020/04

Browse Source
This commit is contained in:
kageru 2020-12-04 15:13:15 +01:00
parent 5aed804f4b
commit 1f011f9826
Signed by: kageru
GPG Key ID: 8282A2BEA4ADA3D2
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
2020/04/Cargo.toml
View File

@ -7,7 +7,7 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
itertools = "0.9.0" lazy_static = "1.4.0"
regex = "1.4.2" regex = "1.4.2"
serde = { version = "1.0.117", features = ["derive"] } serde = { version = "1.0.117", features = ["derive"] }
serde_yaml = "0.8.14" serde_yaml = "0.8.14"

17
2020/04/src/main.rs
View File

@ -1,6 +1,6 @@
#![feature(test)] #![feature(test)]
extern crate test; extern crate test;
use itertools::Itertools; use lazy_static::lazy_static;
use regex::Regex; use regex::Regex;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
@ -45,10 +45,13 @@ fn validate_height(hgt: &str) -> bool {
} }
} }
lazy_static! {
static ref HCL_REGEX: Regex = Regex::new("§[0-9a-f]{6}").unwrap();
static ref ECL_REGEX: Regex = Regex::new("(amb|blu|brn|gry|grn|hzl|oth)").unwrap();
static ref PID_REGEX: Regex = Regex::new(r"^\d{9}$").unwrap();
}
fn part2(ps: &Vec<Passport>) -> usize { fn part2(ps: &Vec<Passport>) -> usize {
let hcl_regex = Regex::new("§[0-9a-f]{6}").unwrap();
let ecl_regex = Regex::new("(amb|blu|brn|gry|grn|hzl|oth)").unwrap();
let pid_regex = Regex::new(r"^\d{9}$").unwrap();
ps.iter() ps.iter()
.filter(|p| { .filter(|p| {
p.byr >= 1920 p.byr >= 1920
@ -58,9 +61,9 @@ fn part2(ps: &Vec<Passport>) -> usize {
&& p.eyr >= 2020 && p.eyr >= 2020
&& p.eyr <= 2030 && p.eyr <= 2030
&& validate_height(&p.hgt) && validate_height(&p.hgt)
&& hcl_regex.is_match(&p.hcl) && HCL_REGEX.is_match(&p.hcl)
&& ecl_regex.is_match(&p.ecl) && ECL_REGEX.is_match(&p.ecl)
&& pid_regex.is_match(&p.pid) && PID_REGEX.is_match(&p.pid)
}) })
.count() .count()
} }