bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rename HandlerFlags as DiagCtxtFlags.

Browse source
This commit is contained in:
Nicholas Nethercote 2023-12-18 08:47:03 +11:00
parent cce1701c4c
commit 9b1f87c7e8
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_errors/src/diagnostic_builder.rs
View file

@ -40,7 +40,7 @@ where
/// ///
/// If there is some state in a downstream crate you would like to /// If there is some state in a downstream crate you would like to
/// access in the methods of `DiagnosticBuilder` here, consider /// access in the methods of `DiagnosticBuilder` here, consider
/// extending `HandlerFlags`, accessed via `self.handler.flags`. /// extending `DiagCtxtFlags`.
#[must_use] #[must_use]
#[derive(Clone)] #[derive(Clone)]
pub struct DiagnosticBuilder<'a, G: EmissionGuarantee> { pub struct DiagnosticBuilder<'a, G: EmissionGuarantee> {

8
compiler/rustc_errors/src/lib.rs
View file

@ -420,7 +420,7 @@ pub struct DiagCtxt {
/// this is done to prevent possible deadlocks in a multi-threaded compiler, /// this is done to prevent possible deadlocks in a multi-threaded compiler,
/// as well as inconsistent state observation. /// as well as inconsistent state observation.
struct DiagCtxtInner { struct DiagCtxtInner {
flags: HandlerFlags, flags: DiagCtxtFlags,
/// The number of lint errors that have been emitted. /// The number of lint errors that have been emitted.
lint_err_count: usize, lint_err_count: usize,
/// The number of errors that have been emitted, including duplicates. /// The number of errors that have been emitted, including duplicates.
@ -518,7 +518,7 @@ pub static TRACK_DIAGNOSTICS: AtomicRef<fn(&mut Diagnostic, &mut dyn FnMut(&mut
AtomicRef::new(&(default_track_diagnostic as _)); AtomicRef::new(&(default_track_diagnostic as _));
#[derive(Copy, Clone, Default)] #[derive(Copy, Clone, Default)]
pub struct HandlerFlags { pub struct DiagCtxtFlags {
/// If false, warning-level lints are suppressed. /// If false, warning-level lints are suppressed.
/// (rustc: see `--allow warnings` and `--cap-lints`) /// (rustc: see `--allow warnings` and `--cap-lints`)
pub can_emit_warnings: bool, pub can_emit_warnings: bool,
@ -585,7 +585,7 @@ impl DiagCtxt {
self self
} }
pub fn with_flags(mut self, flags: HandlerFlags) -> Self { pub fn with_flags(mut self, flags: DiagCtxtFlags) -> Self {
self.inner.get_mut().flags = flags; self.inner.get_mut().flags = flags;
self self
} }
@ -598,7 +598,7 @@ impl DiagCtxt {
pub fn with_emitter(emitter: Box<DynEmitter>) -> Self { pub fn with_emitter(emitter: Box<DynEmitter>) -> Self {
Self { Self {
inner: Lock::new(DiagCtxtInner { inner: Lock::new(DiagCtxtInner {
flags: HandlerFlags { can_emit_warnings: true, ..Default::default() }, flags: DiagCtxtFlags { can_emit_warnings: true, ..Default::default() },
lint_err_count: 0, lint_err_count: 0,
err_count: 0, err_count: 0,
warn_count: 0, warn_count: 0,

6
compiler/rustc_session/src/config.rs
View file

@ -11,7 +11,7 @@ use crate::{EarlyDiagCtxt, Session};
use rustc_data_structures::fx::{FxHashMap, FxHashSet, FxIndexMap, FxIndexSet}; use rustc_data_structures::fx::{FxHashMap, FxHashSet, FxIndexMap, FxIndexSet};
use rustc_data_structures::stable_hasher::{StableOrd, ToStableHashKey}; use rustc_data_structures::stable_hasher::{StableOrd, ToStableHashKey};
use rustc_errors::emitter::HumanReadableErrorType; use rustc_errors::emitter::HumanReadableErrorType;
use rustc_errors::{ColorConfig, DiagnosticArgValue, HandlerFlags, IntoDiagnosticArg}; use rustc_errors::{ColorConfig, DiagCtxtFlags, DiagnosticArgValue, IntoDiagnosticArg};
use rustc_feature::UnstableFeatures; use rustc_feature::UnstableFeatures;
use rustc_span::edition::{Edition, DEFAULT_EDITION, EDITION_NAME_LIST, LATEST_STABLE_EDITION}; use rustc_span::edition::{Edition, DEFAULT_EDITION, EDITION_NAME_LIST, LATEST_STABLE_EDITION};
use rustc_span::source_map::FilePathMapping; use rustc_span::source_map::FilePathMapping;
@ -1155,8 +1155,8 @@ impl Options {
} }
impl UnstableOptions { impl UnstableOptions {
pub fn diagnostic_handler_flags(&self, can_emit_warnings: bool) -> HandlerFlags { pub fn diagnostic_handler_flags(&self, can_emit_warnings: bool) -> DiagCtxtFlags {
HandlerFlags { DiagCtxtFlags {
can_emit_warnings, can_emit_warnings,
treat_err_as_bug: self.treat_err_as_bug, treat_err_as_bug: self.treat_err_as_bug,
dont_buffer_diagnostics: self.dont_buffer_diagnostics, dont_buffer_diagnostics: self.dont_buffer_diagnostics,