diff options
| author | Pietro Albini <pietro.albini@ferrous-systems.com> | 2022-06-07 13:15:41 +0200 |
|---|---|---|
| committer | Pietro Albini <pietro.albini@ferrous-systems.com> | 2022-06-09 19:43:06 +0200 |
| commit | 97f3ecda016ca7ab3edf64e11901466f879d4483 (patch) | |
| tree | ef6186372b1107ab072820db8f791b3cd7fa79d3 /src/bootstrap/lib.rs | |
| parent | c1a0f49e9f92ce7ebb8c9f2a3baefce779bb5950 (diff) | |
| download | rust-97f3ecda016ca7ab3edf64e11901466f879d4483.tar.gz rust-97f3ecda016ca7ab3edf64e11901466f879d4483.zip | |
load configuration for downloading artifacts from stage0.json
Diffstat (limited to 'src/bootstrap/lib.rs')
| -rw-r--r-- | src/bootstrap/lib.rs | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index 022f2e0fc13..c4a1d603b67 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -118,7 +118,6 @@ use std::os::windows::fs::symlink_file; use filetime::FileTime; use once_cell::sync::OnceCell; -use serde::Deserialize; use crate::builder::Kind; use crate::config::{LlvmLibunwind, TargetSelection}; @@ -294,8 +293,6 @@ pub struct Build { hosts: Vec<TargetSelection>, targets: Vec<TargetSelection>, - // Stage 0 (downloaded) compiler, lld and cargo or their local rust equivalents - stage0_metadata: Stage0Metadata, initial_rustc: PathBuf, initial_cargo: PathBuf, initial_lld: PathBuf, @@ -322,18 +319,6 @@ pub struct Build { metrics: metrics::BuildMetrics, } -#[derive(Deserialize)] -struct Stage0Metadata { - dist_server: String, - checksums_sha256: HashMap<String, String>, - rustfmt: Option<RustfmtMetadata>, -} -#[derive(Deserialize)] -struct RustfmtMetadata { - date: String, - version: String, -} - #[derive(Debug)] struct Crate { name: Interned<String>, @@ -482,11 +467,7 @@ impl Build { bootstrap_out }; - let stage0_json = t!(std::fs::read_to_string(&src.join("src").join("stage0.json"))); - let stage0_metadata = t!(serde_json::from_str::<Stage0Metadata>(&stage0_json)); - let mut build = Build { - stage0_metadata, initial_rustc: config.initial_rustc.clone(), initial_cargo: config.initial_cargo.clone(), initial_lld, |
