Skip to content

Commit 514039e

Browse files
committed
make sure the complicated cases are at the end
1 parent 5143c0c commit 514039e

File tree

1 file changed

+24
-19
lines changed

1 file changed

+24
-19
lines changed

tests/testsuite/support/resolver.rs

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -820,25 +820,30 @@ pub fn registry_strategy(
820820
))
821821
}
822822

823-
PrettyPrintRegistry(
824-
list_of_pkgid
825-
.into_iter()
826-
.zip(dependency_by_pkgid.into_iter())
827-
.map(|(((name, ver), allow_deps), deps)| {
828-
pkg_dep(
829-
(name, ver).to_pkgid(),
830-
if !allow_deps {
831-
vec![dep_req("bad", "*")]
832-
} else {
833-
let mut deps = deps;
834-
deps.sort_by_key(|d| d.name_in_toml());
835-
deps.dedup_by_key(|d| d.name_in_toml());
836-
deps
837-
},
838-
)
839-
})
840-
.collect(),
841-
)
823+
let mut out: Vec<Summary> = list_of_pkgid
824+
.into_iter()
825+
.zip(dependency_by_pkgid.into_iter())
826+
.map(|(((name, ver), allow_deps), deps)| {
827+
pkg_dep(
828+
(name, ver).to_pkgid(),
829+
if !allow_deps {
830+
vec![dep_req("bad", "*")]
831+
} else {
832+
let mut deps = deps;
833+
deps.sort_by_key(|d| d.name_in_toml());
834+
deps.dedup_by_key(|d| d.name_in_toml());
835+
deps
836+
},
837+
)
838+
})
839+
.collect();
840+
841+
if reverse_alphabetical {
842+
// make sure the complicated cases are at the end
843+
out.reverse();
844+
}
845+
846+
PrettyPrintRegistry(out)
842847
},
843848
)
844849
}

0 commit comments

Comments
 (0)