make sure the complicated cases are at the end

rust-lang · May 23, 2019 · 514039e · 514039e
1 parent 5143c0c
commit 514039e
Showing 1 changed file with 24 additions and 19 deletions.
diff --git a/tests/testsuite/support/resolver.rs b/tests/testsuite/support/resolver.rs
@@ -820,25 +820,30 @@ pub fn registry_strategy(
  ))
  }
 
- PrettyPrintRegistry(
- list_of_pkgid
- .into_iter()
- .zip(dependency_by_pkgid.into_iter())
- .map(|(((name, ver), allow_deps), deps)| {
- pkg_dep(
- (name, ver).to_pkgid(),
- if !allow_deps {
- vec![dep_req("bad", "*")]
- } else {
- let mut deps = deps;
- deps.sort_by_key(|d| d.name_in_toml());
- deps.dedup_by_key(|d| d.name_in_toml());
- deps
- },
- )
- })
- .collect(),
- )
+ let mut out: Vec<Summary> = list_of_pkgid
+ .into_iter()
+ .zip(dependency_by_pkgid.into_iter())
+ .map(|(((name, ver), allow_deps), deps)| {
+ pkg_dep(
+ (name, ver).to_pkgid(),
+ if !allow_deps {
+ vec![dep_req("bad", "*")]
+ } else {
+ let mut deps = deps;
+ deps.sort_by_key(|d| d.name_in_toml());
+ deps.dedup_by_key(|d| d.name_in_toml());
+ deps
+ },
+ )
+ })
+ .collect();
+
+ if reverse_alphabetical {
+ // make sure the complicated cases are at the end
+ out.reverse();
+ }
+
+ PrettyPrintRegistry(out)
  },
  )
 }