dependency: Adjust "crate_id" property of reverse dependencies query

Author: Turbo87

src/dependency.rs

@@ -30,7 +30,6 @@ pub struct Dependency {
 
 pub struct ReverseDependency {
     dependency: Dependency,
-    crate_name: String,
     crate_downloads: i32,
 }
 
@@ -125,9 +124,9 @@ impl Dependency {
 }
 
 impl ReverseDependency {
-    pub fn encodable(self) -> EncodableDependency {
+    pub fn encodable(self, crate_name: &str) -> EncodableDependency {
         self.dependency.encodable(
-            &self.crate_name,
+            crate_name,
             Some(self.crate_downloads),
         )
     }
@@ -218,11 +217,10 @@ impl Queryable<dependencies::SqlType, Pg> for Dependency {
 impl Queryable<(dependencies::SqlType, Integer, Text), Pg> for ReverseDependency {
     type Row = (<Dependency as Queryable<dependencies::SqlType, Pg>>::Row, i32, String);
 
-    fn build((dep_row, downloads, name): Self::Row) -> Self {
+    fn build((dep_row, downloads, _name): Self::Row) -> Self {
         ReverseDependency {
             dependency: Dependency::build(dep_row),
             crate_downloads: downloads,
-            crate_name: name,
         }
     }
 }

src/krate.rs

@@ -1550,7 +1550,7 @@ pub fn reverse_dependencies(req: &mut Request) -> CargoResult<Response> {
     let (rev_deps, total) = krate.reverse_dependencies(&*conn, offset, limit)?;
     let rev_deps = rev_deps
         .into_iter()
-        .map(ReverseDependency::encodable)
+        .map(|dep| dep.encodable(&krate.name))
         .collect();
 
     #[derive(RustcEncodable)]

src/tests/krate.rs

@@ -1635,7 +1635,7 @@ fn reverse_dependencies() {
     let deps = ::json::<RevDeps>(&mut response);
     assert_eq!(deps.dependencies.len(), 1);
     assert_eq!(deps.meta.total, 1);
-    assert_eq!(deps.dependencies[0].crate_id, "c2");
+    assert_eq!(deps.dependencies[0].crate_id, "c1");
 
     // c1 has no dependent crates.
     req.with_path("/api/v1/crates/c2/reverse_dependencies");
@@ -1670,7 +1670,7 @@ fn reverse_dependencies_when_old_version_doesnt_depend_but_new_does() {
     let deps = ::json::<RevDeps>(&mut response);
     assert_eq!(deps.dependencies.len(), 1);
     assert_eq!(deps.meta.total, 1);
-    assert_eq!(deps.dependencies[0].crate_id, "c2");
+    assert_eq!(deps.dependencies[0].crate_id, "c1");
 }
 
 #[test]
@@ -1728,7 +1728,7 @@ fn prerelease_versions_not_included_in_reverse_dependencies() {
     let deps = ::json::<RevDeps>(&mut response);
     assert_eq!(deps.dependencies.len(), 1);
     assert_eq!(deps.meta.total, 1);
-    assert_eq!(deps.dependencies[0].crate_id, "c3");
+    assert_eq!(deps.dependencies[0].crate_id, "c1");
 }
 
 #[test]
@@ -1756,7 +1756,7 @@ fn yanked_versions_not_included_in_reverse_dependencies() {
     let deps = ::json::<RevDeps>(&mut response);
     assert_eq!(deps.dependencies.len(), 1);
     assert_eq!(deps.meta.total, 1);
-    assert_eq!(deps.dependencies[0].crate_id, "c2");
+    assert_eq!(deps.dependencies[0].crate_id, "c1");
 
     // TODO: have this test call `version.yank()` once the yank method is converted to diesel
     diesel::update(versions::table.filter(versions::num.eq("2.0.0")))