@@ -23,29 +23,52 @@ pub fn add(lib: Vec<String>, test: Vec<String>, bench: Vec<String>) {
2323 });
2424 lines.sort();
2525 lines
26− })
26+ });
27+}
28+
29+enum VersionTag {
30+ Manual(String),
31+ Auto(String),
32+}
33+
34+impl VersionTag {
35+
36+ fn tag(&self) -> &'static str {
37+ match self {
38+ VersionTag::Manual(_) => "manual",
39+ VersionTag::Auto(_) => "auto",
40+ }
41+ }
42+
43+ fn version(&self) -> &str {
44+ match self {
45+ VersionTag::Manual(s) => &s,
46+ VersionTag::Auto(s) => &s,
47+ }
48+ }
2749}
2850
2951pub fn outdated() {
30− let mut all = vec![];
31− handle(false, |_loc, lines| {
52+ let mut all: Vec<String> = vec![];
53+ let disabled = handle(false, |_loc, lines| {
3254 all.extend(lines);
3355 vec![]
3456 });
35− let mut map = BTreeMap::new();
57+ let mut map: BTreeMap<String, VersionTag> = BTreeMap::new();
58+ for DisabledPackage { package, version } in disabled {
59+ map.insert(package, VersionTag::Manual(version));
60+ }
3661 let mut support: BTreeMap<(String, String), BTreeSet<(String, String)>> = BTreeMap::new();
3762 for v in all.into_iter() {
3863 let caps = regex!("tried ([^ ]+)-([^,-]+),").captures(&v).unwrap();
3964 let package = caps.get(1).unwrap().as_str().to_owned();
4065 let version = caps.get(2).unwrap().as_str().to_owned();
41− map.insert(package.clone(), version.clone());
66+ map.insert(package.clone(), VersionTag::Auto(version.clone()));
4267
4368 if let Some(caps) = regex!("does not support: ([^ ]+)-([^-]+)").captures(&v) {
4469 let dep_package = caps.get(1).unwrap().as_str().to_owned();
4570 let dep_version = caps.get(2).unwrap().as_str().to_owned();
46− let entry = support
47− .entry((dep_package, dep_version))
48− .or_default();
71+ let entry = support.entry((dep_package, dep_version)).or_default();
4972 entry.insert((package, version));
5073 }
5174 }
@@ -59,10 +82,10 @@ pub fn outdated() {
5982 }
6083 i += 1;
6184 let latest = latest_version(&package);
62− if version != latest {
85+ if version.version() != latest {
6386 println!(
64− "{} mismatch, snapshot: {}, hackage: {}",
65− package, version, latest
87+ "{} mismatch, {}: {}, hackage: {}",
88+ package, version.tag(), version.version(), latest
6689 );
6790 }
6891 }
@@ -112,16 +135,36 @@ enum State {
112135 Done,
113136}
114137
115−fn handle<F>(write: bool, mut f: F)
138+struct DisabledPackage {
139+ package: String,
140+ version: String,
141+}
142+
143+fn parse_disabled_package(s: &str) -> Option<DisabledPackage> {
144+ if let Some(caps) = regex!(r#"- *([^ ]+) < *0 *# *([\d.]+)"#).captures(s) {
145+ let package = caps.get(1).unwrap().as_str().to_owned();
146+ let version = caps.get(2).unwrap().as_str().to_owned();
147+ Some(DisabledPackage { package, version })
148+ } else {
149+ None
150+ }
151+}
152+
153+fn handle<F>(write: bool, mut f: F) -> Vec<DisabledPackage>
116154where
117155 F: FnMut(Location, Vec<String>) -> Vec<String>,
118156{
119157 let path = "build-constraints.yaml";
120158 let mut new_lines: Vec<String> = vec![];
159+ let mut disabled_packages: Vec<DisabledPackage> = vec![];
121160
122161 let mut state = State::LookingForLibBounds;
123162 let mut buf = vec![];
124163 for line in read_lines(path).map(|s| s.unwrap()) {
164+ if let Some(disabled_package) = parse_disabled_package(&line) {
165+ disabled_packages.push(disabled_package);
166+ }
167+
125168 match state {
126169 State::LookingForLibBounds => {
127170 if line == r#" "Library and exe bounds failures":"# {
@@ -189,6 +232,8 @@ where
189232 }
190233 file.flush().unwrap();
191234 }
235+
236+ disabled_packages
192237}
193238
194239enum Location {