Skip to content

Commit f960e36

Browse files
committed
remove downstream new method
1 parent a0aaa12 commit f960e36

File tree

2 files changed

+12
-51
lines changed

2 files changed

+12
-51
lines changed

src/bootstrap/src/core/config/config.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -735,23 +735,23 @@ impl Config {
735735
);
736736
}
737737

738-
let mut dwn_ctx = DownloadContext::new(
739-
path_modification_cache.clone(),
740-
&src,
741-
rust_info.clone(),
742-
&submodules,
743-
download_rustc_commit.clone(),
738+
let mut dwn_ctx = DownloadContext {
739+
path_modification_cache: path_modification_cache.clone(),
740+
src: &src,
741+
rust_info: rust_info.clone(),
742+
submodules: &submodules,
743+
download_rustc_commit: download_rustc_commit.clone(),
744744
host_target,
745745
llvm_from_ci,
746-
target_config.clone(),
747-
out.clone(),
746+
target_config: target_config.clone(),
747+
out: out.clone(),
748748
patch_binaries_for_nix,
749-
&exec_ctx,
750-
&stage0_metadata,
749+
exec_ctx: &exec_ctx,
750+
stage0_metadata: &stage0_metadata,
751751
llvm_assertions,
752-
&bootstrap_cache_path,
752+
bootstrap_cache_path: &bootstrap_cache_path,
753753
is_running_on_ci,
754-
);
754+
};
755755

756756
let initial_rustc = build_rustc.unwrap_or_else(|| {
757757
download_beta_toolchain(&dwn_ctx);

src/bootstrap/src/core/download.rs

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -418,45 +418,6 @@ pub(crate) struct DownloadContext<'a> {
418418
pub is_running_on_ci: bool,
419419
}
420420

421-
impl<'a> DownloadContext<'a> {
422-
#[allow(clippy::too_many_arguments)]
423-
pub fn new(
424-
path_modification_cache: Arc<Mutex<HashMap<Vec<&'static str>, PathFreshness>>>,
425-
src: &'a Path,
426-
rust_info: channel::GitInfo,
427-
submodules: &'a Option<bool>,
428-
download_rustc_commit: Option<String>,
429-
host_target: TargetSelection,
430-
llvm_from_ci: bool,
431-
target_config: HashMap<TargetSelection, Target>,
432-
out: PathBuf,
433-
patch_binaries_for_nix: Option<bool>,
434-
exec_ctx: &'a ExecutionContext,
435-
stage0_metadata: &'a build_helper::stage0_parser::Stage0,
436-
llvm_assertions: bool,
437-
bootstrap_cache_path: &'a Option<PathBuf>,
438-
is_running_on_ci: bool,
439-
) -> Self {
440-
Self {
441-
path_modification_cache,
442-
src,
443-
rust_info,
444-
submodules,
445-
download_rustc_commit,
446-
host_target,
447-
llvm_from_ci,
448-
target_config,
449-
out,
450-
patch_binaries_for_nix,
451-
exec_ctx,
452-
stage0_metadata,
453-
llvm_assertions,
454-
bootstrap_cache_path,
455-
is_running_on_ci,
456-
}
457-
}
458-
}
459-
460421
impl<'a> AsRef<DownloadContext<'a>> for DownloadContext<'a> {
461422
fn as_ref(&self) -> &DownloadContext<'a> {
462423
self

0 commit comments

Comments
 (0)