]> git.proxmox.com Git - cargo.git/commitdiff
make sure the complicated cases are at the end
authorEh2406 <YeomanYaacov@gmail.com>
Thu, 23 May 2019 20:48:16 +0000 (16:48 -0400)
committerEh2406 <YeomanYaacov@gmail.com>
Thu, 23 May 2019 20:58:29 +0000 (16:58 -0400)
tests/testsuite/support/resolver.rs

index 54f9ba8d5b73bff4143db381536d98a6fedd6823..dcc530d2206e0b47e7c21e7b92b9105660695642 100644 (file)
@@ -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)
             },
         )
 }