From d4fc5ae25cea1068fc2a3d96763d3ede3a6a14d4 Mon Sep 17 00:00:00 2001
From: Eduard-Mihai Burtescu <eddyb@lyken.rs>
Date: Wed, 26 Jan 2022 03:46:56 +0000
Subject: [PATCH] rustc_errors: handle `force_warn` only through
`DiagnosticId::Lint`.
---
compiler/rustc_errors/src/lib.rs | 34 +++++----------------------
compiler/rustc_middle/src/lint.rs | 6 ++---
compiler/rustc_session/src/session.rs | 10 --------
3 files changed, 8 insertions(+), 42 deletions(-)
diff --git a/compiler/rustc_errors/src/lib.rs b/compiler/rustc_errors/src/lib.rs
index 0fae230813b..aec67b5e1fd 100644
--- a/compiler/rustc_errors/src/lib.rs
+++ b/compiler/rustc_errors/src/lib.rs
@@ -632,27 +632,15 @@ impl Handler {
/// Construct a builder at the `Warning` level at the given `span` and with the `msg`.
///
- /// The builder will be canceled if warnings cannot be emitted.
+ /// Attempting to `.emit()` the builder will only emit if either:
+ /// * `can_emit_warnings` is `true`
+ /// * `is_force_warn` was set in `DiagnosticId::Lint`
pub fn struct_span_warn(&self, span: impl Into<MultiSpan>, msg: &str) -> DiagnosticBuilder<'_> {
let mut result = self.struct_warn(msg);
result.set_span(span);
result
}
- /// Construct a builder at the `Warning` level at the given `span` and with the `msg`.
- ///
- /// This will "force" the warning meaning it will not be canceled even
- /// if warnings cannot be emitted.
- pub fn struct_span_force_warn(
- &self,
- span: impl Into<MultiSpan>,
- msg: &str,
- ) -> DiagnosticBuilder<'_> {
- let mut result = self.struct_force_warn(msg);
- result.set_span(span);
- result
- }
-
/// Construct a builder at the `Allow` level at the given `span` and with the `msg`.
pub fn struct_span_allow(
&self,
@@ -679,20 +667,10 @@ impl Handler {
/// Construct a builder at the `Warning` level with the `msg`.
///
- /// The builder will be canceled if warnings cannot be emitted.
+ /// Attempting to `.emit()` the builder will only emit if either:
+ /// * `can_emit_warnings` is `true`
+ /// * `is_force_warn` was set in `DiagnosticId::Lint`
pub fn struct_warn(&self, msg: &str) -> DiagnosticBuilder<'_> {
- let mut result = DiagnosticBuilder::new(self, Level::Warning, msg);
- if !self.flags.can_emit_warnings {
- result.cancel();
- }
- result
- }
-
- /// Construct a builder at the `Warning` level with the `msg`.
- ///
- /// This will "force" a warning meaning it will not be canceled even
- /// if warnings cannot be emitted.
- pub fn struct_force_warn(&self, msg: &str) -> DiagnosticBuilder<'_> {
DiagnosticBuilder::new(self, Level::Warning, msg)
}
diff --git a/compiler/rustc_middle/src/lint.rs b/compiler/rustc_middle/src/lint.rs
index 4388bb87bf0..8e28ae3ce44 100644
--- a/compiler/rustc_middle/src/lint.rs
+++ b/compiler/rustc_middle/src/lint.rs
@@ -314,10 +314,8 @@ pub fn struct_lint_level<'s, 'd>(
return;
}
}
- (Level::Warn, Some(span)) => sess.struct_span_warn(span, ""),
- (Level::Warn, None) => sess.struct_warn(""),
- (Level::ForceWarn, Some(span)) => sess.struct_span_force_warn(span, ""),
- (Level::ForceWarn, None) => sess.struct_force_warn(""),
+ (Level::Warn | Level::ForceWarn, Some(span)) => sess.struct_span_warn(span, ""),
+ (Level::Warn | Level::ForceWarn, None) => sess.struct_warn(""),
(Level::Deny | Level::Forbid, Some(span)) => {
let mut builder = sess.diagnostic().struct_err_lint("");
builder.set_span(span);
diff --git a/compiler/rustc_session/src/session.rs b/compiler/rustc_session/src/session.rs
index c83a60f5feb..0515c440ab8 100644
--- a/compiler/rustc_session/src/session.rs
+++ b/compiler/rustc_session/src/session.rs
@@ -306,13 +306,6 @@ impl Session {
pub fn struct_span_warn<S: Into<MultiSpan>>(&self, sp: S, msg: &str) -> DiagnosticBuilder<'_> {
self.diagnostic().struct_span_warn(sp, msg)
}
- pub fn struct_span_force_warn<S: Into<MultiSpan>>(
- &self,
- sp: S,
- msg: &str,
- ) -> DiagnosticBuilder<'_> {
- self.diagnostic().struct_span_force_warn(sp, msg)
- }
pub fn struct_span_warn_with_code<S: Into<MultiSpan>>(
&self,
sp: S,
@@ -324,9 +317,6 @@ impl Session {
pub fn struct_warn(&self, msg: &str) -> DiagnosticBuilder<'_> {
self.diagnostic().struct_warn(msg)
}
- pub fn struct_force_warn(&self, msg: &str) -> DiagnosticBuilder<'_> {
- self.diagnostic().struct_force_warn(msg)
- }
pub fn struct_span_allow<S: Into<MultiSpan>>(&self, sp: S, msg: &str) -> DiagnosticBuilder<'_> {
self.diagnostic().struct_span_allow(sp, msg)
}