@@ -1,8 +1,7 @@
1−use std::collections::HashMap;
2−use std::fs::File;
1+use std::collections::{HashMap};
32use std::io::{self, BufRead};
4−use std::path::Path;
53
4+use lazy_regex::regex;
65use regex::Regex;
76
87type H = HashMap<Header, Vec<(String, String, String)>>;
@@ -18,43 +17,47 @@ fn main() {
1817 let mut tests: H = Default::default();
1918 let mut benches: H = Default::default();
2019 let mut last_header: Option<Header> = None;
21− let empty = Regex::new(r#"^\s*$"#).unwrap();
22− let header_versioned =
23− Regex::new(r#"^(?P<package>[a-zA-z]([a-zA-z0-9.-]*?))-(?P<version>(\d+(\.\d+)*)).+?is out of bounds for:$"#).unwrap();
24− let header_missing =
25− Regex::new(r#"^(?P<package>[a-zA-z]([a-zA-z0-9.-]*)).+?depended on by:$"#).unwrap();
26− let package =
27− Regex::new(r#"^- \[ \] (?P<package>[a-zA-z]([a-zA-z0-9.-]*?))-(?P<version>(\d+(\.\d+)*)).+?Used by: (?P<component>.+)$"#)
28− .unwrap();
2920
30− if let Ok(lines) = read_lines("./comments.txt") {
31− for line in lines {
32− if let Ok(line) = line {
33− if empty.captures(&line).is_some() {
34− } else if let Some(cap) = package.captures(&line) {
35− let root = last_header.clone().unwrap();
36− let package = cap.name("package").unwrap().as_str();
37− let version = cap.name("version").unwrap().as_str();
38− let component = cap.name("component").unwrap().as_str();
39− match component {
40− "library" | "executable" => {
41− insert(&mut lib_exes, root, package, version, component)
42− }
43− "benchmark" => insert(&mut benches, root, package, version, "benchmarks"),
44− "test-suite" => insert(&mut tests, root, package, version, component),
45− _ => panic!("Bad component: {}", component),
46− }
47− } else if let Some(cap) = header_versioned.captures(&line) {
48− let package = cap.name("package").unwrap().as_str().to_owned();
49− let version = cap.name("version").unwrap().as_str().to_owned();
50− last_header = Some(Header::Versioned { package, version });
51− } else if let Some(cap) = header_missing.captures(&line) {
52− let package = cap.name("package").unwrap().as_str().to_owned();
53− last_header = Some(Header::Missing { package });
54− } else {
55− panic!("Unhandled: {:?}", line);
21+ let header_versioned = regex!(
22+ r#"^(?P<package>[a-zA-z]([a-zA-z0-9.-]*?))-(?P<version>(\d+(\.\d+)*)).+?is out of bounds for:$"#
23+ );
24+ let header_missing = regex!(r#"^(?P<package>[a-zA-z]([a-zA-z0-9.-]*)).+?depended on by:$"#);
25+ let package = regex!(
26+ r#"^- \[ \] (?P<package>[a-zA-z]([a-zA-z0-9.-]*?))-(?P<version>(\d+(\.\d+)*)).+?Used by: (?P<component>.+)$"#
27+ );
28+
29+ // Ignore everything until the bounds issues show up.
30+ let mut process_line = false;
31+
32+ for line in io::stdin().lock().lines().flatten() {
33+ if is_reg_match(&line, regex!(r#"^\s*$"#)) {
34+ // noop
35+ } else if line == "curator: Snapshot dependency graph contains errors:" {
36+ process_line = true;
37+ } else if !process_line {
38+ println!("[INFO] {}", line);
39+ } else if let Some(cap) = package.captures(&line) {
40+ let root = last_header.clone().unwrap();
41+ let package = cap.name("package").unwrap().as_str();
42+ let version = cap.name("version").unwrap().as_str();
43+ let component = cap.name("component").unwrap().as_str();
44+ match component {
45+ "library" | "executable" => {
46+ insert(&mut lib_exes, root, package, version, component)
5647 }
48+ "benchmark" => insert(&mut benches, root, package, version, "benchmarks"),
49+ "test-suite" => insert(&mut tests, root, package, version, component),
50+ _ => panic!("Bad component: {}", component),
5751 }
52+ } else if let Some(cap) = header_versioned.captures(&line) {
53+ let package = cap.name("package").unwrap().as_str().to_owned();
54+ let version = cap.name("version").unwrap().as_str().to_owned();
55+ last_header = Some(Header::Versioned { package, version });
56+ } else if let Some(cap) = header_missing.captures(&line) {
57+ let package = cap.name("package").unwrap().as_str().to_owned();
58+ last_header = Some(Header::Missing { package });
59+ } else {
60+ panic!("Unhandled: {:?}", line);
5861 }
5962 }
6063
@@ -93,7 +96,7 @@ fn printer(
9396 version: &str,
9497 component: &str,
9598 header: &Header,
96−) -> () {
99+) {
97100 let lt0 = if lt0 { " < 0" } else { "" };
98101 println!(
99102 "{indent}- {package}{lt0} # tried {package}-{version}, but its *{component}* {cause}",
@@ -117,17 +120,13 @@ fn printer(
117120}
118121
119122fn insert(h: &mut H, header: Header, package: &str, version: &str, component: &str) {
120− (*h.entry(header).or_insert_with(|| vec![])).push((
123+ (*h.entry(header).or_insert_with(Vec::new)).push((
121124 package.to_owned(),
122125 version.to_owned(),
123126 component.to_owned(),
124127 ));
125128}
126129
127−fn read_lines<P>(filename: P) -> io::Result<io::Lines<io::BufReader<File>>>
128−where
129− P: AsRef<Path>,
130−{
131− let file = File::open(filename)?;
132− Ok(io::BufReader::new(file).lines())
130+fn is_reg_match(s: &str, r: &Regex) -> bool {
131+ r.captures(s).is_some()
133132}