2022 rust fix regex strings

This commit is contained in:
Maciej Jur 2022-12-06 01:16:47 +01:00
parent 9b154dccf8
commit d49d1de9be
2 changed files with 3 additions and 3 deletions

View file

@ -30,7 +30,7 @@ fn solve2(data: &Vec<((i32, i32), (i32, i32))>) -> usize {
fn parse_data(data: Vec<String>) -> Vec<((i32, i32), (i32, i32))> { fn parse_data(data: Vec<String>) -> Vec<((i32, i32), (i32, i32))> {
let re = Regex::new(r"^(\d+)-(\d+),(\d+)-(\d+)$").unwrap(); let re = Regex::new(r#"^(\d+)-(\d+),(\d+)-(\d+)$"#).unwrap();
data.iter() data.iter()
.map(|s| { .map(|s| {
let c = re.captures(s).unwrap(); let c = re.captures(s).unwrap();

View file

@ -44,7 +44,7 @@ fn solve2((stacks, actions): &Data) -> String {
fn parse_data(data: Vec<String>) -> Data { fn parse_data(data: Vec<String>) -> Data {
let stacks = { let stacks = {
let re = Regex::new("( {3}|[\\[\\w\\]]{3}) ?").unwrap(); let re = Regex::new(r#"( {3}|[\[\w\]]{3}) ?"#).unwrap();
let mut boxes = data.iter() let mut boxes = data.iter()
.map_while(|s| { .map_while(|s| {
let cap = re.find_iter(s) let cap = re.find_iter(s)
@ -75,7 +75,7 @@ fn parse_data(data: Vec<String>) -> Data {
.unwrap() .unwrap()
}; };
let actions = { let actions = {
let re = Regex::new("^move (\\d+) from (\\d+) to (\\d+)$").unwrap(); let re = Regex::new(r#"^move (\d+) from (\d+) to (\d+)$"#).unwrap();
data.iter() data.iter()
.filter_map(|str| re.captures(str)) .filter_map(|str| re.captures(str))
.map(|cap| ( .map(|cap| (