diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-08-21 18:15:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-21 18:15:05 +0200 |
| commit | 937a18daf986e0a1a4ffa0b8f28c8f5d9b56e1a3 (patch) | |
| tree | 58c30cb253f68ccd69024aec8ec3e07895eb84e2 /compiler/rustc_incremental/src/errors.rs | |
| parent | be80216d2ca15912557b562847099d3d11f55a01 (diff) | |
| parent | 25ff9b6bcbba9e7831eb4d6eba2df6bbcd267c55 (diff) | |
| download | rust-937a18daf986e0a1a4ffa0b8f28c8f5d9b56e1a3.tar.gz rust-937a18daf986e0a1a4ffa0b8f28c8f5d9b56e1a3.zip | |
Rollup merge of #129344 - compiler-errors:less-option-unit-diagnostics, r=jieyouxu
Use `bool` in favor of `Option<()>` for diagnostics We originally only supported `Option<()>` for optional notes/labels, but we now support `bool`. Let's use that, since it usually leads to more readable code. I'm not removing the support from the derive macro, though I guess we could error on it... 🤔
Diffstat (limited to 'compiler/rustc_incremental/src/errors.rs')
| -rw-r--r-- | compiler/rustc_incremental/src/errors.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_incremental/src/errors.rs b/compiler/rustc_incremental/src/errors.rs index f8910030634..b68c149d398 100644 --- a/compiler/rustc_incremental/src/errors.rs +++ b/compiler/rustc_incremental/src/errors.rs @@ -189,10 +189,10 @@ pub struct CreateLock<'a> { pub lock_err: std::io::Error, pub session_dir: &'a Path, #[note(incremental_lock_unsupported)] - pub is_unsupported_lock: Option<()>, + pub is_unsupported_lock: bool, #[help(incremental_cargo_help_1)] #[help(incremental_cargo_help_2)] - pub is_cargo: Option<()>, + pub is_cargo: bool, } #[derive(Diagnostic)] |