Sort crate dependencies before adding to index

Also ensure that the sorting of dependencies uses all fields.

Author: arlosi

cargo-registry-index/lib.rs

@@ -175,7 +175,26 @@ impl Ord for Dependency {
         // misinterpreted. With this manual `Ord` implementation we ensure that
         // `normal` dependencies are always first when multiple with the same
         // `name` exist.
-        (&self.name, self.kind, &self.req).cmp(&(&other.name, other.kind, &other.req))
+        (
+            &self.name,
+            self.kind,
+            &self.req,
+            self.optional,
+            self.default_features,
+            &self.target,
+            &self.package,
+            &self.features,
+        )
+            .cmp(&(
+                &other.name,
+                other.kind,
+                &other.req,
+                other.optional,
+                other.default_features,
+                &other.target,
+                &other.package,
+                &other.features,
+            ))
     }
 }
 

src/controllers/krate/publish.rs

@@ -409,8 +409,9 @@ pub fn add_dependencies(
         })
         .collect::<Result<Vec<_>, _>>()?;
 
-    let (git_deps, new_dependencies): (Vec<_>, Vec<_>) =
+    let (mut git_deps, new_dependencies): (Vec<_>, Vec<_>) =
         git_and_new_dependencies.into_iter().unzip();
+    git_deps.sort();
 
     insert_into(dependencies)
         .values(&new_dependencies)