Skip to content

Commit 653945f

Browse files
committed
dependency: Adjust "crate_id" property of reverse dependencies query
1 parent 086249c commit 653945f

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

src/dependency.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ pub struct Dependency {
3030

3131
pub struct ReverseDependency {
3232
dependency: Dependency,
33-
crate_name: String,
3433
crate_downloads: i32,
3534
}
3635

@@ -125,9 +124,9 @@ impl Dependency {
125124
}
126125

127126
impl ReverseDependency {
128-
pub fn encodable(self) -> EncodableDependency {
127+
pub fn encodable(self, crate_name: &str) -> EncodableDependency {
129128
self.dependency.encodable(
130-
&self.crate_name,
129+
crate_name,
131130
Some(self.crate_downloads),
132131
)
133132
}
@@ -218,11 +217,10 @@ impl Queryable<dependencies::SqlType, Pg> for Dependency {
218217
impl Queryable<(dependencies::SqlType, Integer, Text), Pg> for ReverseDependency {
219218
type Row = (<Dependency as Queryable<dependencies::SqlType, Pg>>::Row, i32, String);
220219

221-
fn build((dep_row, downloads, name): Self::Row) -> Self {
220+
fn build((dep_row, downloads, _name): Self::Row) -> Self {
222221
ReverseDependency {
223222
dependency: Dependency::build(dep_row),
224223
crate_downloads: downloads,
225-
crate_name: name,
226224
}
227225
}
228226
}

src/krate.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1550,7 +1550,7 @@ pub fn reverse_dependencies(req: &mut Request) -> CargoResult<Response> {
15501550
let (rev_deps, total) = krate.reverse_dependencies(&*conn, offset, limit)?;
15511551
let rev_deps = rev_deps
15521552
.into_iter()
1553-
.map(ReverseDependency::encodable)
1553+
.map(|dep| dep.encodable(&krate.name))
15541554
.collect();
15551555

15561556
#[derive(RustcEncodable)]

src/tests/krate.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1635,7 +1635,7 @@ fn reverse_dependencies() {
16351635
let deps = ::json::<RevDeps>(&mut response);
16361636
assert_eq!(deps.dependencies.len(), 1);
16371637
assert_eq!(deps.meta.total, 1);
1638-
assert_eq!(deps.dependencies[0].crate_id, "c2");
1638+
assert_eq!(deps.dependencies[0].crate_id, "c1");
16391639

16401640
// c1 has no dependent crates.
16411641
req.with_path("/api/v1/crates/c2/reverse_dependencies");
@@ -1670,7 +1670,7 @@ fn reverse_dependencies_when_old_version_doesnt_depend_but_new_does() {
16701670
let deps = ::json::<RevDeps>(&mut response);
16711671
assert_eq!(deps.dependencies.len(), 1);
16721672
assert_eq!(deps.meta.total, 1);
1673-
assert_eq!(deps.dependencies[0].crate_id, "c2");
1673+
assert_eq!(deps.dependencies[0].crate_id, "c1");
16741674
}
16751675

16761676
#[test]
@@ -1728,7 +1728,7 @@ fn prerelease_versions_not_included_in_reverse_dependencies() {
17281728
let deps = ::json::<RevDeps>(&mut response);
17291729
assert_eq!(deps.dependencies.len(), 1);
17301730
assert_eq!(deps.meta.total, 1);
1731-
assert_eq!(deps.dependencies[0].crate_id, "c3");
1731+
assert_eq!(deps.dependencies[0].crate_id, "c1");
17321732
}
17331733

17341734
#[test]
@@ -1756,7 +1756,7 @@ fn yanked_versions_not_included_in_reverse_dependencies() {
17561756
let deps = ::json::<RevDeps>(&mut response);
17571757
assert_eq!(deps.dependencies.len(), 1);
17581758
assert_eq!(deps.meta.total, 1);
1759-
assert_eq!(deps.dependencies[0].crate_id, "c2");
1759+
assert_eq!(deps.dependencies[0].crate_id, "c1");
17601760

17611761
// TODO: have this test call `version.yank()` once the yank method is converted to diesel
17621762
diesel::update(versions::table.filter(versions::num.eq("2.0.0")))

0 commit comments

Comments
 (0)