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_const_eval/src | |
| 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_const_eval/src')
| -rw-r--r-- | compiler/rustc_const_eval/src/check_consts/ops.rs | 14 | ||||
| -rw-r--r-- | compiler/rustc_const_eval/src/errors.rs | 10 |
2 files changed, 12 insertions, 12 deletions
diff --git a/compiler/rustc_const_eval/src/check_consts/ops.rs b/compiler/rustc_const_eval/src/check_consts/ops.rs index c6361710ac9..259114dbdc2 100644 --- a/compiler/rustc_const_eval/src/check_consts/ops.rs +++ b/compiler/rustc_const_eval/src/check_consts/ops.rs @@ -384,7 +384,7 @@ impl<'tcx> NonConstOp<'tcx> for HeapAllocation { ccx.dcx().create_err(errors::UnallowedHeapAllocations { span, kind: ccx.const_kind(), - teach: ccx.tcx.sess.teach(E0010).then_some(()), + teach: ccx.tcx.sess.teach(E0010), }) } } @@ -444,16 +444,16 @@ impl<'tcx> NonConstOp<'tcx> for CellBorrow { if let hir::ConstContext::Static(_) = ccx.const_kind() { ccx.dcx().create_err(errors::InteriorMutableDataRefer { span, - opt_help: Some(()), + opt_help: true, kind: ccx.const_kind(), - teach: ccx.tcx.sess.teach(E0492).then_some(()), + teach: ccx.tcx.sess.teach(E0492), }) } else { ccx.dcx().create_err(errors::InteriorMutableDataRefer { span, - opt_help: None, + opt_help: false, kind: ccx.const_kind(), - teach: ccx.tcx.sess.teach(E0492).then_some(()), + teach: ccx.tcx.sess.teach(E0492), }) } } @@ -481,12 +481,12 @@ impl<'tcx> NonConstOp<'tcx> for MutBorrow { hir::BorrowKind::Raw => ccx.tcx.dcx().create_err(errors::UnallowedMutableRaw { span, kind: ccx.const_kind(), - teach: ccx.tcx.sess.teach(E0764).then_some(()), + teach: ccx.tcx.sess.teach(E0764), }), hir::BorrowKind::Ref => ccx.dcx().create_err(errors::UnallowedMutableRefs { span, kind: ccx.const_kind(), - teach: ccx.tcx.sess.teach(E0764).then_some(()), + teach: ccx.tcx.sess.teach(E0764), }), } } diff --git a/compiler/rustc_const_eval/src/errors.rs b/compiler/rustc_const_eval/src/errors.rs index 7afb92c08ec..6075f3f84cd 100644 --- a/compiler/rustc_const_eval/src/errors.rs +++ b/compiler/rustc_const_eval/src/errors.rs @@ -151,7 +151,7 @@ pub(crate) struct UnallowedMutableRefs { pub span: Span, pub kind: ConstContext, #[note(const_eval_teach_note)] - pub teach: Option<()>, + pub teach: bool, } #[derive(Diagnostic)] @@ -161,7 +161,7 @@ pub(crate) struct UnallowedMutableRaw { pub span: Span, pub kind: ConstContext, #[note(const_eval_teach_note)] - pub teach: Option<()>, + pub teach: bool, } #[derive(Diagnostic)] #[diag(const_eval_non_const_fmt_macro_call, code = E0015)] @@ -196,7 +196,7 @@ pub(crate) struct UnallowedHeapAllocations { pub span: Span, pub kind: ConstContext, #[note(const_eval_teach_note)] - pub teach: Option<()>, + pub teach: bool, } #[derive(Diagnostic)] @@ -214,10 +214,10 @@ pub(crate) struct InteriorMutableDataRefer { #[label] pub span: Span, #[help] - pub opt_help: Option<()>, + pub opt_help: bool, pub kind: ConstContext, #[note(const_eval_teach_note)] - pub teach: Option<()>, + pub teach: bool, } #[derive(Diagnostic)] |