diff options
| author | bors <bors@rust-lang.org> | 2022-04-17 00:44:53 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-04-17 00:44:53 +0000 |
| commit | 2c28b0eaf9843ec0f493fca2dba506fe4d9174fb (patch) | |
| tree | 5911ea08448072405a169ece70c78e940b5445d1 /src/bootstrap | |
| parent | 563ef23529ae800b2b136cabdc71a81d86a75f58 (diff) | |
| parent | b47265e65866cf94ee3bb82908bbc5138ed1f5a7 (diff) | |
| download | rust-2c28b0eaf9843ec0f493fca2dba506fe4d9174fb.tar.gz rust-2c28b0eaf9843ec0f493fca2dba506fe4d9174fb.zip | |
Auto merge of #96134 - Dylan-DPC:rollup-ejug3yq, r=Dylan-DPC
Rollup of 6 pull requests Successful merges: - #95346 (Stablize `const_extern_fn` for "Rust" and "C") - #95933 (htmldocck: Compare HTML tree instead of plain text html) - #96105 (Make the debug output for `TargetSelection` less verbose) - #96112 (Strict provenance lint diagnostics improvements) - #96119 (update Miri) - #96124 (to_digit tweak) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/config.rs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs index 9534cc5f434..d7c29f6900a 100644 --- a/src/bootstrap/config.rs +++ b/src/bootstrap/config.rs @@ -221,7 +221,7 @@ impl FromStr for LlvmLibunwind { } } -#[derive(Debug, Copy, Clone, Default, PartialEq, Eq, PartialOrd, Ord, Hash)] +#[derive(Copy, Clone, Default, PartialEq, Eq, PartialOrd, Ord, Hash)] pub struct TargetSelection { pub triple: Interned<String>, file: Option<Interned<String>>, @@ -276,6 +276,12 @@ impl fmt::Display for TargetSelection { } } +impl fmt::Debug for TargetSelection { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + write!(f, "{}", self) + } +} + impl PartialEq<&str> for TargetSelection { fn eq(&self, other: &&str) -> bool { self.triple == *other |
