bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #129344 - compiler-errors:less-option-unit-diagnostics, r=jieyouxu

Browse source 
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... 🤔
This commit is contained in:
Matthias Krüger 2024-08-21 18:15:05 +02:00 • committed by GitHub
commit 937a18daf9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
48 changed files with 106 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

14
compiler/rustc_const_eval/src/check_consts/ops.rs
View file

@ -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),
}),
}
}

10
compiler/rustc_const_eval/src/errors.rs
View file

@ -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)]