Handle renamed dependencies coming from Cargo

This commit is intended to be coupled with
rust-lang/cargo#5993 where Cargo will start sending the
registry more information about locally renamed crates to persist into the
index.

Author: alexcrichton

src/git.rs

@@ -34,6 +34,8 @@ pub struct Dependency {
     pub default_features: bool,
     pub target: Option<String>,
     pub kind: Option<DependencyKind>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub package: Option<String>,
 }
 
 fn index_file(base: &Path, name: &str) -> PathBuf {

src/models/dependency.rs

@@ -96,15 +96,26 @@ pub fn add_dependencies(
                 ));
             }
 
+            // If this dependency has an explicit name in `Cargo.toml` that
+            // means that the `name` we have listed is actually the package name
+            // that we're depending on. The `name` listed in the index is the
+            // Cargo.toml-written-name which is what cargo uses for
+            // `--extern foo=...`
+            let (name, package) = match &dep.explicit_name_in_toml {
+                Some(explicit) => (explicit.to_string(), Some(dep.name.to_string())),
+                None => (dep.name.to_string(), None),
+            };
+
             Ok((
                 git::Dependency {
-                    name: dep.name.to_string(),
+                    name,
                     req: dep.version_req.to_string(),
                     features: dep.features.iter().map(|s| s.to_string()).collect(),
                     optional: dep.optional,
                     default_features: dep.default_features,
                     target: dep.target.clone(),
                     kind: dep.kind.or(Some(DependencyKind::Normal)),
+                    package,
                 },
                 (
                     version_id.eq(target_version_id),

src/views/krate_publish.rs

@@ -63,6 +63,7 @@ pub struct CrateDependency {
     pub version_req: CrateVersionReq,
     pub target: Option<String>,
     pub kind: Option<DependencyKind>,
+    pub explicit_name_in_toml: Option<CrateName>,
 }
 
 impl<'de> Deserialize<'de> for CrateName {