Skip to content

Commit 634c96e

Browse files
committed
dist: drop Copy derive from DownloadCfg
1 parent b59416f commit 634c96e

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/dist/download.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use crate::utils;
2121

2222
const UPDATE_HASH_LEN: usize = 20;
2323

24-
#[derive(Copy, Clone)]
24+
#[derive(Clone)]
2525
pub struct DownloadCfg<'a> {
2626
pub dist_root: &'a str,
2727
pub tmp_cx: &'a temp::Context,

src/dist/mod.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -968,7 +968,7 @@ pub(crate) async fn update_from_dist(
968968
let mut toolchain = opts.toolchain.clone();
969969
let res = loop {
970970
let result = try_update_from_dist_(
971-
opts.dl_cfg,
971+
&opts.dl_cfg,
972972
opts.update_hash,
973973
&toolchain,
974974
match opts.exists {
@@ -1067,7 +1067,7 @@ pub(crate) async fn update_from_dist(
10671067

10681068
#[allow(clippy::too_many_arguments)]
10691069
async fn try_update_from_dist_(
1070-
download: DownloadCfg<'_>,
1070+
download: &DownloadCfg<'_>,
10711071
update_hash: Option<&Path>,
10721072
toolchain: &ToolchainDesc,
10731073
profile: Option<Profile>,
@@ -1152,7 +1152,7 @@ async fn try_update_from_dist_(
11521152
&m,
11531153
changes,
11541154
force_update,
1155-
&download,
1155+
download,
11561156
&toolchain.manifest_name(),
11571157
true,
11581158
)
@@ -1233,7 +1233,7 @@ async fn try_update_from_dist_(
12331233
}
12341234

12351235
pub(crate) async fn dl_v2_manifest(
1236-
download: DownloadCfg<'_>,
1236+
download: &DownloadCfg<'_>,
12371237
update_hash: Option<&Path>,
12381238
toolchain: &ToolchainDesc,
12391239
) -> Result<Option<(ManifestV2, String)>> {
@@ -1282,7 +1282,7 @@ pub(crate) async fn dl_v2_manifest(
12821282
}
12831283

12841284
async fn dl_v1_manifest(
1285-
download: DownloadCfg<'_>,
1285+
download: &DownloadCfg<'_>,
12861286
toolchain: &ToolchainDesc,
12871287
) -> Result<Vec<String>> {
12881288
let root_url = toolchain.package_dir(download.dist_root);

src/toolchain/distributable.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ impl<'a> DistributableToolchain<'a> {
526526
let update_hash = self.toolchain.cfg.get_hash_file(&self.desc, false)?;
527527
let download_cfg = DownloadCfg::new(self.toolchain.cfg);
528528

529-
match crate::dist::dl_v2_manifest(download_cfg, Some(&update_hash), &self.desc).await? {
529+
match crate::dist::dl_v2_manifest(&download_cfg, Some(&update_hash), &self.desc).await? {
530530
Some((manifest, _)) => Ok(Some(manifest.get_rust_version()?.to_string())),
531531
None => Ok(None),
532532
}

0 commit comments

Comments
 (0)