Skip to content

Commit 4014e15

Browse files
authored
Rollup merge of #94568 - bjorn3:rustbuild_remove_dead_code, r=Mark-Simulacrum
Remove some dead code from rustbuild This should reduce build time a tiny bit.
2 parents ee3a2c7 + e8f790f commit 4014e15

File tree

2 files changed

+8
-17
lines changed

2 files changed

+8
-17
lines changed

src/bootstrap/config.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ macro_rules! derive_merge {
387387

388388
derive_merge! {
389389
/// TOML representation of various global build decisions.
390-
#[derive(Deserialize, Default, Clone)]
390+
#[derive(Deserialize, Default)]
391391
#[serde(deny_unknown_fields, rename_all = "kebab-case")]
392392
struct Build {
393393
build: Option<String>,
@@ -434,7 +434,7 @@ derive_merge! {
434434

435435
derive_merge! {
436436
/// TOML representation of various global install decisions.
437-
#[derive(Deserialize, Default, Clone)]
437+
#[derive(Deserialize)]
438438
#[serde(deny_unknown_fields, rename_all = "kebab-case")]
439439
struct Install {
440440
prefix: Option<String>,
@@ -449,7 +449,7 @@ derive_merge! {
449449

450450
derive_merge! {
451451
/// TOML representation of how the LLVM build is configured.
452-
#[derive(Deserialize, Default)]
452+
#[derive(Deserialize)]
453453
#[serde(deny_unknown_fields, rename_all = "kebab-case")]
454454
struct Llvm {
455455
skip_rebuild: Option<bool>,
@@ -483,7 +483,7 @@ derive_merge! {
483483
}
484484

485485
derive_merge! {
486-
#[derive(Deserialize, Default, Clone)]
486+
#[derive(Deserialize)]
487487
#[serde(deny_unknown_fields, rename_all = "kebab-case")]
488488
struct Dist {
489489
sign_folder: Option<String>,
@@ -510,7 +510,7 @@ impl Default for StringOrBool {
510510

511511
derive_merge! {
512512
/// TOML representation of how the Rust build is configured.
513-
#[derive(Deserialize, Default)]
513+
#[derive(Deserialize)]
514514
#[serde(deny_unknown_fields, rename_all = "kebab-case")]
515515
struct Rust {
516516
optimize: Option<bool>,
@@ -565,7 +565,7 @@ derive_merge! {
565565

566566
derive_merge! {
567567
/// TOML representation of how each build target is configured.
568-
#[derive(Deserialize, Default)]
568+
#[derive(Deserialize)]
569569
#[serde(deny_unknown_fields, rename_all = "kebab-case")]
570570
struct TomlTarget {
571571
cc: Option<String>,

src/bootstrap/toolstate.rs

+2-11
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const OS: Option<&str> = None;
2424

2525
type ToolstateData = HashMap<Box<str>, ToolState>;
2626

27-
#[derive(Copy, Clone, Debug, Deserialize, Serialize, PartialEq, Eq, PartialOrd)]
27+
#[derive(Copy, Clone, Debug, Deserialize, Serialize, PartialEq, PartialOrd)]
2828
#[serde(rename_all = "kebab-case")]
2929
/// Whether a tool can be compiled, tested or neither
3030
pub enum ToolState {
@@ -50,13 +50,6 @@ impl fmt::Display for ToolState {
5050
}
5151
}
5252

53-
impl Default for ToolState {
54-
fn default() -> Self {
55-
// err on the safe side
56-
ToolState::BuildFail
57-
}
58-
}
59-
6053
/// Number of days after the last promotion of beta.
6154
/// Its value is 41 on the Tuesday where "Promote master to beta (T-2)" happens.
6255
/// The Wednesday after this has value 0.
@@ -466,13 +459,11 @@ fn publish_test_results(current_toolstate: &ToolstateData) {
466459
t!(fs::write(&history_path, file));
467460
}
468461

469-
#[derive(Debug, Serialize, Deserialize)]
462+
#[derive(Debug, Deserialize)]
470463
struct RepoState {
471464
tool: String,
472465
windows: ToolState,
473466
linux: ToolState,
474-
commit: String,
475-
datetime: String,
476467
}
477468

478469
impl RepoState {

0 commit comments

Comments
 (0)