Skip to content

Commit

Permalink
Rename DiagnosticImportance as DiagImportance.
Browse files Browse the repository at this point in the history
  • Loading branch information
nnethercote committed Feb 27, 2024
1 parent 9b3520e commit 8f3b007
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 16 deletions.
4 changes: 2 additions & 2 deletions compiler/rustc_const_eval/src/transform/check_consts/check.rs
Original file line number Diff line number Diff line change
Expand Up @@ -318,12 +318,12 @@ impl<'mir, 'tcx> Checker<'mir, 'tcx> {
assert!(err.is_error());

match op.importance() {
ops::DiagnosticImportance::Primary => {
ops::DiagImportance::Primary => {
let reported = err.emit();
self.error_emitted = Some(reported);
}

ops::DiagnosticImportance::Secondary => self.secondary_errors.push(err),
ops::DiagImportance::Secondary => self.secondary_errors.push(err),
}
}

Expand Down
26 changes: 12 additions & 14 deletions compiler/rustc_const_eval/src/transform/check_consts/ops.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ pub enum Status {
}

#[derive(Clone, Copy)]
pub enum DiagnosticImportance {
pub enum DiagImportance {
/// An operation that must be removed for const-checking to pass.
Primary,

Expand All @@ -44,8 +44,8 @@ pub trait NonConstOp<'tcx>: std::fmt::Debug {
Status::Forbidden
}

fn importance(&self) -> DiagnosticImportance {
DiagnosticImportance::Primary
fn importance(&self) -> DiagImportance {
DiagImportance::Primary
}

fn build_error(&self, ccx: &ConstCx<'_, 'tcx>, span: Span) -> Diag<'tcx>;
Expand Down Expand Up @@ -427,10 +427,10 @@ impl<'tcx> NonConstOp<'tcx> for TransientCellBorrow {
/// it in the future for static items.
pub struct CellBorrow;
impl<'tcx> NonConstOp<'tcx> for CellBorrow {
fn importance(&self) -> DiagnosticImportance {
fn importance(&self) -> DiagImportance {
// Most likely the code will try to do mutation with these borrows, which
// triggers its own errors. Only show this one if that does not happen.
DiagnosticImportance::Secondary
DiagImportance::Secondary
}
fn build_error(&self, ccx: &ConstCx<'_, 'tcx>, span: Span) -> Diag<'tcx> {
// FIXME: Maybe a more elegant solution to this if else case
Expand Down Expand Up @@ -463,10 +463,10 @@ impl<'tcx> NonConstOp<'tcx> for MutBorrow {
Status::Forbidden
}

fn importance(&self) -> DiagnosticImportance {
fn importance(&self) -> DiagImportance {
// Most likely the code will try to do mutation with these borrows, which
// triggers its own errors. Only show this one if that does not happen.
DiagnosticImportance::Secondary
DiagImportance::Secondary
}

fn build_error(&self, ccx: &ConstCx<'_, 'tcx>, span: Span) -> Diag<'tcx> {
Expand Down Expand Up @@ -515,9 +515,9 @@ impl<'tcx> NonConstOp<'tcx> for MutDeref {
Status::Unstable(sym::const_mut_refs)
}

fn importance(&self) -> DiagnosticImportance {
fn importance(&self) -> DiagImportance {
// Usually a side-effect of a `TransientMutBorrow` somewhere.
DiagnosticImportance::Secondary
DiagImportance::Secondary
}

fn build_error(&self, ccx: &ConstCx<'_, 'tcx>, span: Span) -> Diag<'tcx> {
Expand Down Expand Up @@ -625,12 +625,10 @@ pub mod ty {
Status::Unstable(sym::const_mut_refs)
}

fn importance(&self) -> DiagnosticImportance {
fn importance(&self) -> DiagImportance {
match self.0 {
mir::LocalKind::Temp => DiagnosticImportance::Secondary,
mir::LocalKind::ReturnPointer | mir::LocalKind::Arg => {
DiagnosticImportance::Primary
}
mir::LocalKind::Temp => DiagImportance::Secondary,
mir::LocalKind::ReturnPointer | mir::LocalKind::Arg => DiagImportance::Primary,
}
}

Expand Down

0 comments on commit 8f3b007

Please sign in to comment.