diff options
| author | bors <bors@rust-lang.org> | 2022-09-26 14:22:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-09-26 14:22:43 +0000 |
| commit | e1d7dec558d863fb76f98453088b36cb1a926d48 (patch) | |
| tree | 3a8cfcc9efe63d005f678b7296755f01f01d99c2 /compiler/rustc_errors/src | |
| parent | 84946fe2412194418b838c34815b79d36b22d4f8 (diff) | |
| parent | f7b0c858a5c50946537abf053549b3df98b7f76a (diff) | |
| download | rust-e1d7dec558d863fb76f98453088b36cb1a926d48.tar.gz rust-e1d7dec558d863fb76f98453088b36cb1a926d48.zip | |
Auto merge of #102051 - pietroalbini:pa-bootstrap-update, r=Mark-Simulacrum
Update bootstrap compiler to 1.65.0 This PR updates the bootstrap compiler to Rust 1.65.0, removing the various `cfg(bootstrap)`s. r? `@Mark-Simulacrum`
Diffstat (limited to 'compiler/rustc_errors/src')
| -rw-r--r-- | compiler/rustc_errors/src/lib.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/rustc_errors/src/lib.rs b/compiler/rustc_errors/src/lib.rs index b44cf352233..4d262ae0f5e 100644 --- a/compiler/rustc_errors/src/lib.rs +++ b/compiler/rustc_errors/src/lib.rs @@ -7,7 +7,6 @@ #![feature(if_let_guard)] #![feature(adt_const_params)] #![feature(let_chains)] -#![cfg_attr(bootstrap, feature(let_else))] #![feature(never_type)] #![feature(result_option_inspect)] #![feature(rustc_attrs)] @@ -69,7 +68,7 @@ pub type PResult<'a, T> = Result<T, DiagnosticBuilder<'a, ErrorGuaranteed>>; // (See also the comment on `DiagnosticBuilder`'s `diagnostic` field.) #[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))] rustc_data_structures::static_assert_size!(PResult<'_, ()>, 16); -#[cfg(all(target_arch = "x86_64", target_pointer_width = "64", not(bootstrap)))] +#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))] rustc_data_structures::static_assert_size!(PResult<'_, bool>, 16); #[derive(Debug, PartialEq, Eq, Clone, Copy, Hash, Encodable, Decodable)] |