itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-28 11:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

use the hash method not a copy paste of its code

Browse Source
This commit is contained in:
Jacob Finkelman 2023-09-11 16:19:15 +00:00
parent 423bf0588d
commit 366e871778
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cargo/sources/registry/index.rs
View File

@ -430,7 +430,7 @@ impl<'cfg> RegistryIndex<'cfg> {
///
/// Internally there's quite a few layer of caching to amortize this cost
/// though since this method is called quite a lot on null builds in Cargo.
pub fn summaries<'a, 'b>(
fn summaries<'a, 'b>(
&'a mut self,
name: &str,
req: &'b OptVersionReq,

19
src/cargo/sources/registry/mod.rs
View File

@ -208,9 +208,7 @@ use crate::sources::source::Source;
use crate::sources::PathSource;
use crate::util::hex;
use crate::util::network::PollExt;
use crate::util::{
restricted_names, CargoResult, Config, Filesystem, LimitErrorReader, OptVersionReq,
};
use crate::util::{restricted_names, CargoResult, Config, Filesystem, LimitErrorReader};
/// The `.cargo-ok` file is used to track if the source is already unpacked.
/// See [`RegistrySource::unpack_package`] for more.
@ -690,19 +688,14 @@ impl<'cfg> RegistrySource<'cfg> {
// After we've loaded the package configure its summary's `checksum`
// field with the checksum we know for this `PackageId`.
let req = OptVersionReq::exact(package.version());
let summary_with_cksum = self
let cksum = self
.index
.summaries(&package.name(), &req, &mut *self.ops)?
.hash(package, &mut *self.ops)
.expect("a downloaded dep now pending!?")
.filter(|s| s.package_id().version() == package.version())
.next()
.expect("summary not found");
if let Some(cksum) = summary_with_cksum.as_summary().checksum() {
pkg.manifest_mut()
.summary_mut()
.set_checksum(cksum.to_string());
}
pkg.manifest_mut()
.summary_mut()
.set_checksum(cksum.to_string());
Ok(pkg)
}