2019-06-10 10:59:03 +02:00
|
|
|
//! Diagnostics creation and emission for `rustc`.
|
2019-06-09 12:04:40 +02:00
|
|
|
//!
|
|
|
|
//! This module contains the code for creating and emitting diagnostics.
|
|
|
|
|
2024-01-14 10:57:35 +11:00
|
|
|
// tidy-alphabetical-start
|
|
|
|
#![allow(incomplete_features)]
|
|
|
|
#![allow(internal_features)]
|
2024-02-06 09:51:39 +11:00
|
|
|
#![allow(rustc::diagnostic_outside_of_impl)]
|
|
|
|
#![allow(rustc::untranslatable_diagnostic)]
|
2024-02-10 14:52:57 +11:00
|
|
|
#![cfg_attr(bootstrap, feature(min_specialization))]
|
2020-09-23 21:51:56 +02:00
|
|
|
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
|
2023-11-13 07:39:17 -05:00
|
|
|
#![doc(rust_logo)]
|
2023-01-15 14:29:20 +01:00
|
|
|
#![feature(array_windows)]
|
2023-12-18 16:31:15 +11:00
|
|
|
#![feature(associated_type_defaults)]
|
2024-01-08 07:47:02 +11:00
|
|
|
#![feature(box_into_inner)]
|
2024-01-14 20:08:47 +00:00
|
|
|
#![feature(box_patterns)]
|
2024-01-14 10:57:35 +11:00
|
|
|
#![feature(error_reporter)]
|
2023-04-09 00:37:21 +02:00
|
|
|
#![feature(extract_if)]
|
2024-01-29 23:59:09 +01:00
|
|
|
#![feature(generic_nonzero)]
|
2022-08-20 20:40:08 +02:00
|
|
|
#![feature(let_chains)]
|
2024-01-05 17:35:54 +11:00
|
|
|
#![feature(negative_impls)]
|
2022-03-09 16:11:28 -08:00
|
|
|
#![feature(never_type)]
|
2022-06-10 15:50:06 +01:00
|
|
|
#![feature(rustc_attrs)]
|
2024-01-14 10:57:35 +11:00
|
|
|
#![feature(rustdoc_internals)]
|
2024-02-06 16:35:19 +11:00
|
|
|
#![feature(trait_alias)]
|
2023-01-05 03:39:07 +01:00
|
|
|
#![feature(try_blocks)]
|
2024-01-14 10:57:35 +11:00
|
|
|
#![feature(yeet_expr)]
|
|
|
|
// tidy-alphabetical-end
|
2016-06-21 18:08:13 -04:00
|
|
|
|
2020-06-11 15:49:57 +01:00
|
|
|
#[macro_use]
|
|
|
|
extern crate rustc_macros;
|
|
|
|
|
2021-09-20 15:24:47 +00:00
|
|
|
#[macro_use]
|
|
|
|
extern crate tracing;
|
|
|
|
|
2023-07-03 18:08:49 +09:00
|
|
|
extern crate self as rustc_errors;
|
|
|
|
|
Stop using `String` for error codes.
Error codes are integers, but `String` is used everywhere to represent
them. Gross!
This commit introduces `ErrCode`, an integral newtype for error codes,
replacing `String`. It also introduces a constant for every error code,
e.g. `E0123`, and removes the `error_code!` macro. The constants are
imported wherever used with `use rustc_errors::codes::*`.
With the old code, we have three different ways to specify an error code
at a use point:
```
error_code!(E0123) // macro call
struct_span_code_err!(dcx, span, E0123, "msg"); // bare ident arg to macro call
\#[diag(name, code = "E0123")] // string
struct Diag;
```
With the new code, they all use the `E0123` constant.
```
E0123 // constant
struct_span_code_err!(dcx, span, E0123, "msg"); // constant
\#[diag(name, code = E0123)] // constant
struct Diag;
```
The commit also changes the structure of the error code definitions:
- `rustc_error_codes` now just defines a higher-order macro listing the
used error codes and nothing else.
- Because that's now the only thing in the `rustc_error_codes` crate, I
moved it into the `lib.rs` file and removed the `error_codes.rs` file.
- `rustc_errors` uses that macro to define everything, e.g. the error
code constants and the `DIAGNOSTIC_TABLES`. This is in its new
`codes.rs` file.
2024-01-14 10:57:07 +11:00
|
|
|
pub use codes::*;
|
2023-12-19 15:11:38 +11:00
|
|
|
pub use diagnostic::{
|
2024-02-16 06:07:49 +11:00
|
|
|
AddToDiagnostic, BugAbort, DecorateLint, Diagnostic, DiagnosticArg, DiagnosticArgMap,
|
|
|
|
DiagnosticArgName, DiagnosticArgValue, DiagnosticBuilder, DiagnosticStyledString,
|
|
|
|
EmissionGuarantee, FatalAbort, IntoDiagnostic, IntoDiagnosticArg, StringPart, SubDiagnostic,
|
|
|
|
SubdiagnosticMessageOp,
|
2023-12-19 15:11:38 +11:00
|
|
|
};
|
|
|
|
pub use diagnostic_impls::{
|
|
|
|
DiagnosticArgFromDisplay, DiagnosticSymbolList, ExpectedLifetimeParameter,
|
Reduce capabilities of `Diagnostic`.
Currently many diagnostic modifier methods are available on both
`Diagnostic` and `DiagnosticBuilder`. This commit removes most of them
from `Diagnostic`. To minimize the diff size, it keeps them within
`diagnostic.rs` but changes the surrounding `impl Diagnostic` block to
`impl DiagnosticBuilder`. (I intend to move things around later, to give
a more sensible code layout.)
`Diagnostic` keeps a few methods that it still needs, like `sub`,
`arg`, and `replace_args`.
The `forward!` macro, which defined two additional methods per call
(e.g. `note` and `with_note`), is replaced by the `with_fn!` macro,
which defines one additional method per call (e.g. `with_note`). It's
now also only used when necessary -- not all modifier methods currently
need a `with_*` form. (New ones can be easily added as necessary.)
All this also requires changing `trait AddToDiagnostic` so its methods
take `DiagnosticBuilder` instead of `Diagnostic`, which leads to many
mechanical changes. `SubdiagnosticMessageOp` gains a type parameter `G`.
There are three subdiagnostics -- `DelayedAtWithoutNewline`,
`DelayedAtWithNewline`, and `InvalidFlushedDelayedDiagnosticLevel` --
that are created within the diagnostics machinery and appended to
external diagnostics. These are handled at the `Diagnostic` level, which
means it's now hard to construct them via `derive(Diagnostic)`, so
instead we construct them by hand. This has no effect on what they look
like when printed.
There are lots of new `allow` markers for `untranslatable_diagnostics`
and `diagnostics_outside_of_impl`. This is because
`#[rustc_lint_diagnostics]` annotations were present on the `Diagnostic`
modifier methods, but missing from the `DiagnosticBuilder` modifier
methods. They're now present.
2024-02-06 16:44:30 +11:00
|
|
|
IndicateAnonymousLifetime, SingleLabelManySpans,
|
2023-12-19 15:11:38 +11:00
|
|
|
};
|
2016-06-21 18:08:13 -04:00
|
|
|
pub use emitter::ColorConfig;
|
2023-12-19 15:11:38 +11:00
|
|
|
pub use rustc_error_messages::{
|
|
|
|
fallback_fluent_bundle, fluent_bundle, DelayDm, DiagnosticMessage, FluentBundle,
|
|
|
|
LanguageIdentifier, LazyFallbackBundle, MultiSpan, SpanLabel, SubdiagnosticMessage,
|
|
|
|
};
|
|
|
|
pub use rustc_lint_defs::{pluralize, Applicability};
|
|
|
|
pub use rustc_span::fatal_error::{FatalError, FatalErrorMarker};
|
|
|
|
pub use rustc_span::ErrorGuaranteed;
|
|
|
|
pub use snippet::Style;
|
2015-12-15 14:11:27 +13:00
|
|
|
|
2023-12-19 15:11:38 +11:00
|
|
|
// Used by external projects such as `rust-gpu`.
|
|
|
|
// See https://github.com/rust-lang/rust/pull/115393.
|
|
|
|
pub use termcolor::{Color, ColorSpec, WriteColor};
|
2015-12-15 14:11:27 +13:00
|
|
|
|
2024-01-05 10:02:40 +11:00
|
|
|
use emitter::{is_case_difference, DynEmitter, Emitter, HumanEmitter};
|
2019-04-17 13:26:38 -04:00
|
|
|
use registry::Registry;
|
2023-12-31 13:04:43 +01:00
|
|
|
use rustc_data_structures::fx::{FxHashSet, FxIndexMap, FxIndexSet};
|
2023-04-07 23:11:20 -04:00
|
|
|
use rustc_data_structures::stable_hasher::{Hash128, StableHasher};
|
2020-10-31 03:14:32 +01:00
|
|
|
use rustc_data_structures::sync::{Lock, Lrc};
|
2019-12-25 13:38:57 -05:00
|
|
|
use rustc_data_structures::AtomicRef;
|
2023-12-19 15:11:38 +11:00
|
|
|
use rustc_lint_defs::LintExpectationId;
|
2019-12-31 20:15:40 +03:00
|
|
|
use rustc_span::source_map::SourceMap;
|
2023-09-02 04:02:11 +00:00
|
|
|
use rustc_span::{Loc, Span, DUMMY_SP};
|
2023-12-19 15:11:38 +11:00
|
|
|
use std::backtrace::{Backtrace, BacktraceStatus};
|
2017-06-11 13:31:40 +02:00
|
|
|
use std::borrow::Cow;
|
2023-01-08 23:35:43 +01:00
|
|
|
use std::error::Report;
|
2022-12-31 01:20:59 +00:00
|
|
|
use std::fmt;
|
2022-04-14 23:07:57 -07:00
|
|
|
use std::hash::Hash;
|
2023-03-03 22:25:18 +00:00
|
|
|
use std::io::Write;
|
2024-01-29 23:59:09 +01:00
|
|
|
use std::num::NonZero;
|
2024-02-13 16:19:40 +11:00
|
|
|
use std::ops::DerefMut;
|
2018-01-21 12:47:58 +01:00
|
|
|
use std::panic;
|
2023-03-03 22:25:18 +00:00
|
|
|
use std::path::{Path, PathBuf};
|
2015-12-15 14:11:27 +13:00
|
|
|
|
2023-12-19 15:11:38 +11:00
|
|
|
use Level::*;
|
2018-02-27 10:33:02 -08:00
|
|
|
|
2019-06-05 21:13:56 +02:00
|
|
|
pub mod annotate_snippet_emitter_writer;
|
Stop using `String` for error codes.
Error codes are integers, but `String` is used everywhere to represent
them. Gross!
This commit introduces `ErrCode`, an integral newtype for error codes,
replacing `String`. It also introduces a constant for every error code,
e.g. `E0123`, and removes the `error_code!` macro. The constants are
imported wherever used with `use rustc_errors::codes::*`.
With the old code, we have three different ways to specify an error code
at a use point:
```
error_code!(E0123) // macro call
struct_span_code_err!(dcx, span, E0123, "msg"); // bare ident arg to macro call
\#[diag(name, code = "E0123")] // string
struct Diag;
```
With the new code, they all use the `E0123` constant.
```
E0123 // constant
struct_span_code_err!(dcx, span, E0123, "msg"); // constant
\#[diag(name, code = E0123)] // constant
struct Diag;
```
The commit also changes the structure of the error code definitions:
- `rustc_error_codes` now just defines a higher-order macro listing the
used error codes and nothing else.
- Because that's now the only thing in the `rustc_error_codes` crate, I
moved it into the `lib.rs` file and removed the `error_codes.rs` file.
- `rustc_errors` uses that macro to define everything, e.g. the error
code constants and the `DIAGNOSTIC_TABLES`. This is in its new
`codes.rs` file.
2024-01-14 10:57:07 +11:00
|
|
|
pub mod codes;
|
2017-08-19 03:09:55 +03:00
|
|
|
mod diagnostic;
|
2022-10-04 20:56:05 -04:00
|
|
|
mod diagnostic_impls;
|
2015-12-15 14:11:27 +13:00
|
|
|
pub mod emitter;
|
2023-01-05 03:39:07 +01:00
|
|
|
pub mod error;
|
2019-06-05 21:13:56 +02:00
|
|
|
pub mod json;
|
2017-07-02 13:46:38 -07:00
|
|
|
mod lock;
|
Add a simple markdown parser for formatting `rustc --explain`
Currently, the output of `rustc --explain foo` displays the raw markdown in a
pager. This is acceptable, but using actual formatting makes it easier to
understand.
This patch consists of three major components:
1. A markdown parser. This is an extremely simple non-backtracking recursive
implementation that requires normalization of the final token stream
2. A utility to write the token stream to an output buffer
3. Configuration within rustc_driver_impl to invoke this combination for
`--explain`. Like the current implementation, it first attempts to print to
a pager with a fallback colorized terminal, and standard print as a last
resort.
If color is disabled, or if the output does not support it, or if printing
with color fails, it will write the raw markdown (which matches current
behavior).
Pagers known to support color are: `less` (with `-r`), `bat` (aka `catbat`),
and `delta`.
The markdown parser does not support the entire markdown specification, but
should support the following with reasonable accuracy:
- Headings, including formatting
- Comments
- Code, inline and fenced block (no indented block)
- Strong, emphasis, and strikethrough formatted text
- Links, anchor, inline, and reference-style
- Horizontal rules
- Unordered and ordered list items, including formatting
This parser and writer should be reusable by other systems if ever needed.
2022-12-19 12:09:40 -06:00
|
|
|
pub mod markdown;
|
2016-06-21 18:08:13 -04:00
|
|
|
pub mod registry;
|
2019-12-22 17:42:04 -05:00
|
|
|
mod snippet;
|
2017-07-02 13:46:38 -07:00
|
|
|
mod styled_buffer;
|
2023-01-08 23:35:43 +01:00
|
|
|
#[cfg(test)]
|
|
|
|
mod tests;
|
2022-08-10 17:30:47 +01:00
|
|
|
pub mod translation;
|
2022-03-24 02:03:04 +00:00
|
|
|
|
2023-12-19 15:26:24 +11:00
|
|
|
pub type PErr<'a> = DiagnosticBuilder<'a>;
|
2022-09-21 14:01:39 +10:00
|
|
|
pub type PResult<'a, T> = Result<T, PErr<'a>>;
|
2019-10-11 13:06:36 +02:00
|
|
|
|
2023-11-22 09:53:07 +11:00
|
|
|
rustc_fluent_macro::fluent_messages! { "../messages.ftl" }
|
2022-10-13 10:13:02 +01:00
|
|
|
|
2019-10-11 13:06:36 +02:00
|
|
|
// `PResult` is used a lot. Make sure it doesn't unintentionally get bigger.
|
2021-03-06 16:02:48 +00:00
|
|
|
#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
|
2022-01-24 15:14:40 +00:00
|
|
|
rustc_data_structures::static_assert_size!(PResult<'_, ()>, 16);
|
2022-09-20 15:41:42 +02:00
|
|
|
#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
|
2022-03-08 19:07:01 +00:00
|
|
|
rustc_data_structures::static_assert_size!(PResult<'_, bool>, 16);
|
2019-10-11 13:06:36 +02:00
|
|
|
|
2020-06-11 15:49:57 +01:00
|
|
|
#[derive(Debug, PartialEq, Eq, Clone, Copy, Hash, Encodable, Decodable)]
|
2019-02-08 02:45:53 -08:00
|
|
|
pub enum SuggestionStyle {
|
|
|
|
/// Hide the suggested code when displaying this suggestion inline.
|
|
|
|
HideCodeInline,
|
2019-02-09 03:39:08 -08:00
|
|
|
/// Always hide the suggested code but display the message.
|
2019-02-08 02:45:53 -08:00
|
|
|
HideCodeAlways,
|
2019-02-09 03:39:08 -08:00
|
|
|
/// Do not display this suggestion in the cli output, it is only meant for tools.
|
|
|
|
CompletelyHidden,
|
2019-02-08 02:45:53 -08:00
|
|
|
/// Always show the suggested code.
|
|
|
|
/// This will *not* show the code if the suggestion is inline *and* the suggested code is
|
|
|
|
/// empty.
|
|
|
|
ShowCode,
|
2019-10-03 13:22:18 -07:00
|
|
|
/// Always show the suggested code independently.
|
|
|
|
ShowAlways,
|
2019-02-08 02:45:53 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
impl SuggestionStyle {
|
|
|
|
fn hide_inline(&self) -> bool {
|
2020-10-26 21:02:48 -04:00
|
|
|
!matches!(*self, SuggestionStyle::ShowCode)
|
2019-02-08 02:45:53 -08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-06-11 15:49:57 +01:00
|
|
|
#[derive(Clone, Debug, PartialEq, Hash, Encodable, Decodable)]
|
2015-12-13 13:12:47 +01:00
|
|
|
pub struct CodeSuggestion {
|
2017-05-09 10:04:24 +02:00
|
|
|
/// Each substitute can have multiple variants due to multiple
|
|
|
|
/// applicable suggestions
|
|
|
|
///
|
|
|
|
/// `foo.bar` might be replaced with `a.b` or `x.y` by replacing
|
|
|
|
/// `foo` and `bar` on their own:
|
|
|
|
///
|
2022-04-15 15:04:34 -07:00
|
|
|
/// ```ignore (illustrative)
|
2017-05-09 10:04:24 +02:00
|
|
|
/// vec![
|
2017-11-03 16:17:33 +01:00
|
|
|
/// Substitution { parts: vec![(0..3, "a"), (4..7, "b")] },
|
|
|
|
/// Substitution { parts: vec![(0..3, "x"), (4..7, "y")] },
|
2017-05-09 10:04:24 +02:00
|
|
|
/// ]
|
|
|
|
/// ```
|
|
|
|
///
|
|
|
|
/// or by replacing the entire span:
|
|
|
|
///
|
2022-04-15 15:04:34 -07:00
|
|
|
/// ```ignore (illustrative)
|
2017-11-03 16:17:33 +01:00
|
|
|
/// vec![
|
|
|
|
/// Substitution { parts: vec![(0..7, "a.b")] },
|
|
|
|
/// Substitution { parts: vec![(0..7, "x.y")] },
|
|
|
|
/// ]
|
2017-05-09 10:04:24 +02:00
|
|
|
/// ```
|
2017-11-03 16:17:33 +01:00
|
|
|
pub substitutions: Vec<Substitution>,
|
2022-03-23 07:34:20 +00:00
|
|
|
pub msg: DiagnosticMessage,
|
2019-02-08 02:45:53 -08:00
|
|
|
/// Visual representation of this suggestion.
|
|
|
|
pub style: SuggestionStyle,
|
2018-01-18 17:17:46 +05:30
|
|
|
/// Whether or not the suggestion is approximate
|
|
|
|
///
|
|
|
|
/// Sometimes we may show suggestions with placeholders,
|
|
|
|
/// which are useful for users but not useful for
|
|
|
|
/// tools like rustfix
|
2018-04-25 14:51:06 -07:00
|
|
|
pub applicability: Applicability,
|
2016-06-21 18:08:13 -04:00
|
|
|
}
|
|
|
|
|
2020-06-11 15:49:57 +01:00
|
|
|
#[derive(Clone, Debug, PartialEq, Hash, Encodable, Decodable)]
|
2017-05-11 15:26:22 +02:00
|
|
|
/// See the docs on `CodeSuggestion::substitutions`
|
|
|
|
pub struct Substitution {
|
2017-11-03 16:17:33 +01:00
|
|
|
pub parts: Vec<SubstitutionPart>,
|
|
|
|
}
|
|
|
|
|
2020-06-11 15:49:57 +01:00
|
|
|
#[derive(Clone, Debug, PartialEq, Hash, Encodable, Decodable)]
|
2017-11-03 16:17:33 +01:00
|
|
|
pub struct SubstitutionPart {
|
2017-05-11 15:26:22 +02:00
|
|
|
pub span: Span,
|
2017-11-03 16:17:33 +01:00
|
|
|
pub snippet: String,
|
2017-05-11 15:26:22 +02:00
|
|
|
}
|
|
|
|
|
2021-06-21 19:07:19 -07:00
|
|
|
/// Used to translate between `Span`s and byte positions within a single output line in highlighted
|
|
|
|
/// code of structured suggestions.
|
|
|
|
#[derive(Debug, Clone, Copy)]
|
2023-12-21 16:04:51 +11:00
|
|
|
pub(crate) struct SubstitutionHighlight {
|
2021-06-21 19:07:19 -07:00
|
|
|
start: usize,
|
|
|
|
end: usize,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl SubstitutionPart {
|
|
|
|
pub fn is_addition(&self, sm: &SourceMap) -> bool {
|
2022-09-11 19:19:07 +00:00
|
|
|
!self.snippet.is_empty() && !self.replaces_meaningful_content(sm)
|
2021-06-21 19:07:19 -07:00
|
|
|
}
|
|
|
|
|
2022-09-11 19:19:07 +00:00
|
|
|
pub fn is_deletion(&self, sm: &SourceMap) -> bool {
|
|
|
|
self.snippet.trim().is_empty() && self.replaces_meaningful_content(sm)
|
2021-06-21 19:07:19 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
pub fn is_replacement(&self, sm: &SourceMap) -> bool {
|
2022-09-11 19:19:07 +00:00
|
|
|
!self.snippet.is_empty() && self.replaces_meaningful_content(sm)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn replaces_meaningful_content(&self, sm: &SourceMap) -> bool {
|
|
|
|
sm.span_to_snippet(self.span)
|
|
|
|
.map_or(!self.span.is_empty(), |snippet| !snippet.trim().is_empty())
|
2021-06-21 19:07:19 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-12-13 13:12:47 +01:00
|
|
|
impl CodeSuggestion {
|
2019-10-13 21:48:39 -07:00
|
|
|
/// Returns the assembled code suggestions, whether they should be shown with an underline
|
|
|
|
/// and whether the substitution only differs in capitalization.
|
2023-12-21 16:04:51 +11:00
|
|
|
pub(crate) fn splice_lines(
|
2021-06-21 19:07:19 -07:00
|
|
|
&self,
|
|
|
|
sm: &SourceMap,
|
|
|
|
) -> Vec<(String, Vec<SubstitutionPart>, Vec<Vec<SubstitutionHighlight>>, bool)> {
|
|
|
|
// For the `Vec<Vec<SubstitutionHighlight>>` value, the first level of the vector
|
|
|
|
// corresponds to the output snippet's lines, while the second level corresponds to the
|
|
|
|
// substrings within that line that should be highlighted.
|
|
|
|
|
2019-12-31 20:15:40 +03:00
|
|
|
use rustc_span::{CharPos, Pos};
|
2015-12-13 13:12:47 +01:00
|
|
|
|
2023-08-24 17:09:14 -04:00
|
|
|
/// Extracts a substring from the provided `line_opt` based on the specified low and high indices,
|
|
|
|
/// appends it to the given buffer `buf`, and returns the count of newline characters in the substring
|
|
|
|
/// for accurate highlighting.
|
|
|
|
/// If `line_opt` is `None`, a newline character is appended to the buffer, and 0 is returned.
|
|
|
|
///
|
|
|
|
/// ## Returns
|
|
|
|
///
|
|
|
|
/// The count of newline characters in the extracted substring.
|
2016-10-18 23:13:02 +05:30
|
|
|
fn push_trailing(
|
|
|
|
buf: &mut String,
|
2019-02-07 03:53:01 +09:00
|
|
|
line_opt: Option<&Cow<'_, str>>,
|
2016-10-18 23:13:02 +05:30
|
|
|
lo: &Loc,
|
|
|
|
hi_opt: Option<&Loc>,
|
2021-06-21 19:07:19 -07:00
|
|
|
) -> usize {
|
|
|
|
let mut line_count = 0;
|
2023-08-24 17:09:14 -04:00
|
|
|
// Convert CharPos to Usize, as CharPose is character offset
|
|
|
|
// Extract low index and high index
|
2016-10-18 23:13:02 +05:30
|
|
|
let (lo, hi_opt) = (lo.col.to_usize(), hi_opt.map(|hi| hi.col.to_usize()));
|
2015-12-13 13:12:47 +01:00
|
|
|
if let Some(line) = line_opt {
|
2017-02-25 22:05:30 +09:00
|
|
|
if let Some(lo) = line.char_indices().map(|(i, _)| i).nth(lo) {
|
2023-08-24 17:09:14 -04:00
|
|
|
// Get high index while account for rare unicode and emoji with char_indices
|
2017-02-25 22:05:30 +09:00
|
|
|
let hi_opt = hi_opt.and_then(|hi| line.char_indices().map(|(i, _)| i).nth(hi));
|
2019-01-17 13:53:21 +00:00
|
|
|
match hi_opt {
|
2023-08-24 17:09:14 -04:00
|
|
|
// If high index exist, take string from low to high index
|
2021-06-21 19:07:19 -07:00
|
|
|
Some(hi) if hi > lo => {
|
2023-08-24 17:09:14 -04:00
|
|
|
// count how many '\n' exist
|
2021-06-21 19:07:19 -07:00
|
|
|
line_count = line[lo..hi].matches('\n').count();
|
|
|
|
buf.push_str(&line[lo..hi])
|
|
|
|
}
|
2019-01-17 13:53:21 +00:00
|
|
|
Some(_) => (),
|
2023-08-24 17:09:14 -04:00
|
|
|
// If high index absence, take string from low index till end string.len
|
2021-06-21 19:07:19 -07:00
|
|
|
None => {
|
2023-08-24 17:09:14 -04:00
|
|
|
// count how many '\n' exist
|
2021-06-21 19:07:19 -07:00
|
|
|
line_count = line[lo..].matches('\n').count();
|
|
|
|
buf.push_str(&line[lo..])
|
|
|
|
}
|
2019-01-17 13:53:21 +00:00
|
|
|
}
|
2015-12-13 13:12:47 +01:00
|
|
|
}
|
2023-08-24 17:09:14 -04:00
|
|
|
// If high index is None
|
2020-03-04 15:53:14 +01:00
|
|
|
if hi_opt.is_none() {
|
2015-12-13 13:12:47 +01:00
|
|
|
buf.push('\n');
|
|
|
|
}
|
|
|
|
}
|
2021-06-21 19:07:19 -07:00
|
|
|
line_count
|
2015-12-13 13:12:47 +01:00
|
|
|
}
|
|
|
|
|
2017-11-03 16:17:33 +01:00
|
|
|
assert!(!self.substitutions.is_empty());
|
|
|
|
|
|
|
|
self.substitutions
|
|
|
|
.iter()
|
2020-01-16 18:27:18 -08:00
|
|
|
.filter(|subst| {
|
|
|
|
// Suggestions coming from macros can have malformed spans. This is a heavy
|
|
|
|
// handed approach to avoid ICEs by ignoring the suggestion outright.
|
2020-02-22 16:07:05 +02:00
|
|
|
let invalid = subst.parts.iter().any(|item| sm.is_valid_span(item.span).is_err());
|
2020-01-16 18:27:18 -08:00
|
|
|
if invalid {
|
|
|
|
debug!("splice_lines: suggestion contains an invalid span: {:?}", subst);
|
|
|
|
}
|
|
|
|
!invalid
|
|
|
|
})
|
2017-11-03 16:17:33 +01:00
|
|
|
.cloned()
|
2020-01-24 18:03:09 -08:00
|
|
|
.filter_map(|mut substitution| {
|
2017-11-03 16:17:33 +01:00
|
|
|
// Assumption: all spans are in the same file, and all spans
|
|
|
|
// are disjoint. Sort in ascending order.
|
|
|
|
substitution.parts.sort_by_key(|part| part.span.lo());
|
2019-12-22 17:42:04 -05:00
|
|
|
|
2017-11-03 16:17:33 +01:00
|
|
|
// Find the bounding span.
|
2020-01-24 18:03:09 -08:00
|
|
|
let lo = substitution.parts.iter().map(|part| part.span.lo()).min()?;
|
|
|
|
let hi = substitution.parts.iter().map(|part| part.span.hi()).max()?;
|
2019-08-11 01:44:55 +03:00
|
|
|
let bounding_span = Span::with_root_ctxt(lo, hi);
|
2020-01-24 18:03:09 -08:00
|
|
|
// The different spans might belong to different contexts, if so ignore suggestion.
|
2020-02-22 16:07:05 +02:00
|
|
|
let lines = sm.span_to_lines(bounding_span).ok()?;
|
2020-03-13 17:01:35 -04:00
|
|
|
assert!(!lines.lines.is_empty() || bounding_span.is_dummy());
|
2019-12-22 17:42:04 -05:00
|
|
|
|
2020-03-05 15:31:11 +00:00
|
|
|
// We can't splice anything if the source is unavailable.
|
2023-08-31 12:50:44 +02:00
|
|
|
if !sm.ensure_source_file_source_present(&lines.file) {
|
2020-03-05 15:31:11 +00:00
|
|
|
return None;
|
|
|
|
}
|
|
|
|
|
2021-06-21 19:07:19 -07:00
|
|
|
let mut highlights = vec![];
|
2017-11-03 16:17:33 +01:00
|
|
|
// To build up the result, we do this for each span:
|
|
|
|
// - push the line segment trailing the previous span
|
|
|
|
// (at the beginning a "phantom" span pointing at the start of the line)
|
|
|
|
// - push lines between the previous and current span (if any)
|
|
|
|
// - if the previous and current span are not on the same line
|
|
|
|
// push the line segment leading up to the current span
|
|
|
|
// - splice in the span substitution
|
|
|
|
//
|
|
|
|
// Finally push the trailing line segment of the last span
|
2020-02-22 16:07:05 +02:00
|
|
|
let sf = &lines.file;
|
|
|
|
let mut prev_hi = sm.lookup_char_pos(bounding_span.lo());
|
2017-11-03 16:17:33 +01:00
|
|
|
prev_hi.col = CharPos::from_usize(0);
|
2020-03-13 17:01:35 -04:00
|
|
|
let mut prev_line =
|
|
|
|
lines.lines.get(0).and_then(|line0| sf.get_line(line0.line_index));
|
2017-11-03 16:17:33 +01:00
|
|
|
let mut buf = String::new();
|
2019-12-22 17:42:04 -05:00
|
|
|
|
2021-06-21 19:07:19 -07:00
|
|
|
let mut line_highlight = vec![];
|
2021-08-12 19:33:19 +00:00
|
|
|
// We need to keep track of the difference between the existing code and the added
|
|
|
|
// or deleted code in order to point at the correct column *after* substitution.
|
|
|
|
let mut acc = 0;
|
2024-02-14 19:18:28 +00:00
|
|
|
let mut only_capitalization = false;
|
2017-11-03 16:17:33 +01:00
|
|
|
for part in &substitution.parts {
|
2024-02-14 19:18:28 +00:00
|
|
|
only_capitalization |= is_case_difference(sm, &part.snippet, part.span);
|
2020-02-22 16:07:05 +02:00
|
|
|
let cur_lo = sm.lookup_char_pos(part.span.lo());
|
2017-05-09 10:04:24 +02:00
|
|
|
if prev_hi.line == cur_lo.line {
|
2021-06-21 19:07:19 -07:00
|
|
|
let mut count =
|
|
|
|
push_trailing(&mut buf, prev_line.as_ref(), &prev_hi, Some(&cur_lo));
|
|
|
|
while count > 0 {
|
|
|
|
highlights.push(std::mem::take(&mut line_highlight));
|
2021-08-12 19:33:19 +00:00
|
|
|
acc = 0;
|
2021-06-21 19:07:19 -07:00
|
|
|
count -= 1;
|
|
|
|
}
|
2017-05-09 10:04:24 +02:00
|
|
|
} else {
|
2021-08-17 15:46:42 +00:00
|
|
|
acc = 0;
|
2021-06-21 19:07:19 -07:00
|
|
|
highlights.push(std::mem::take(&mut line_highlight));
|
|
|
|
let mut count = push_trailing(&mut buf, prev_line.as_ref(), &prev_hi, None);
|
|
|
|
while count > 0 {
|
|
|
|
highlights.push(std::mem::take(&mut line_highlight));
|
|
|
|
count -= 1;
|
|
|
|
}
|
2017-05-09 10:04:24 +02:00
|
|
|
// push lines between the previous and current span (if any)
|
|
|
|
for idx in prev_hi.line..(cur_lo.line - 1) {
|
2020-02-22 16:07:05 +02:00
|
|
|
if let Some(line) = sf.get_line(idx) {
|
2017-06-11 13:31:40 +02:00
|
|
|
buf.push_str(line.as_ref());
|
2017-05-09 10:04:24 +02:00
|
|
|
buf.push('\n');
|
2021-06-21 19:07:19 -07:00
|
|
|
highlights.push(std::mem::take(&mut line_highlight));
|
2019-12-22 17:42:04 -05:00
|
|
|
}
|
|
|
|
}
|
2020-02-22 16:07:05 +02:00
|
|
|
if let Some(cur_line) = sf.get_line(cur_lo.line - 1) {
|
2020-04-12 11:36:37 -04:00
|
|
|
let end = match cur_line.char_indices().nth(cur_lo.col.to_usize()) {
|
|
|
|
Some((i, _)) => i,
|
|
|
|
None => cur_line.len(),
|
|
|
|
};
|
2019-07-25 15:59:38 -07:00
|
|
|
buf.push_str(&cur_line[..end]);
|
2017-05-09 10:04:24 +02:00
|
|
|
}
|
|
|
|
}
|
2021-06-21 19:07:19 -07:00
|
|
|
// Add a whole line highlight per line in the snippet.
|
2021-08-23 12:42:08 +00:00
|
|
|
let len: isize = part
|
|
|
|
.snippet
|
|
|
|
.split('\n')
|
|
|
|
.next()
|
|
|
|
.unwrap_or(&part.snippet)
|
|
|
|
.chars()
|
|
|
|
.map(|c| match c {
|
|
|
|
'\t' => 4,
|
|
|
|
_ => 1,
|
|
|
|
})
|
|
|
|
.sum();
|
2021-06-21 19:07:19 -07:00
|
|
|
line_highlight.push(SubstitutionHighlight {
|
2021-08-12 19:33:19 +00:00
|
|
|
start: (cur_lo.col.0 as isize + acc) as usize,
|
2021-08-23 12:42:08 +00:00
|
|
|
end: (cur_lo.col.0 as isize + acc + len) as usize,
|
2021-06-21 19:07:19 -07:00
|
|
|
});
|
2021-08-12 19:33:19 +00:00
|
|
|
buf.push_str(&part.snippet);
|
2021-08-23 12:42:08 +00:00
|
|
|
let cur_hi = sm.lookup_char_pos(part.span.hi());
|
2023-05-19 00:44:14 +02:00
|
|
|
// Account for the difference between the width of the current code and the
|
|
|
|
// snippet being suggested, so that the *later* suggestions are correctly
|
|
|
|
// aligned on the screen. Note that cur_hi and cur_lo can be on different
|
|
|
|
// lines, so cur_hi.col can be smaller than cur_lo.col
|
|
|
|
acc += len - (cur_hi.col.0 as isize - cur_lo.col.0 as isize);
|
2021-08-23 12:42:08 +00:00
|
|
|
prev_hi = cur_hi;
|
2021-08-12 19:33:19 +00:00
|
|
|
prev_line = sf.get_line(prev_hi.line - 1);
|
2021-06-21 19:07:19 -07:00
|
|
|
for line in part.snippet.split('\n').skip(1) {
|
2021-08-12 19:33:19 +00:00
|
|
|
acc = 0;
|
2021-06-21 19:07:19 -07:00
|
|
|
highlights.push(std::mem::take(&mut line_highlight));
|
2021-08-23 12:42:08 +00:00
|
|
|
let end: usize = line
|
|
|
|
.chars()
|
|
|
|
.map(|c| match c {
|
|
|
|
'\t' => 4,
|
|
|
|
_ => 1,
|
|
|
|
})
|
|
|
|
.sum();
|
|
|
|
line_highlight.push(SubstitutionHighlight { start: 0, end });
|
2021-06-21 19:07:19 -07:00
|
|
|
}
|
2015-12-13 13:12:47 +01:00
|
|
|
}
|
2021-06-21 19:07:19 -07:00
|
|
|
highlights.push(std::mem::take(&mut line_highlight));
|
2017-05-10 13:19:29 +02:00
|
|
|
// if the replacement already ends with a newline, don't print the next line
|
|
|
|
if !buf.ends_with('\n') {
|
2017-11-03 16:17:33 +01:00
|
|
|
push_trailing(&mut buf, prev_line.as_ref(), &prev_hi, None);
|
2017-05-10 13:19:29 +02:00
|
|
|
}
|
2017-08-18 12:46:28 +02:00
|
|
|
// remove trailing newlines
|
|
|
|
while buf.ends_with('\n') {
|
|
|
|
buf.pop();
|
|
|
|
}
|
2021-06-21 19:07:19 -07:00
|
|
|
Some((buf, substitution.parts, highlights, only_capitalization))
|
2017-11-03 16:17:33 +01:00
|
|
|
})
|
|
|
|
.collect()
|
2015-12-15 14:11:27 +13:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Signifies that the compiler died with an explicit call to `.bug`
|
|
|
|
/// or `.span_bug` rather than a failed assertion, etc.
|
|
|
|
pub struct ExplicitBug;
|
|
|
|
|
2024-02-12 15:26:59 +11:00
|
|
|
/// Signifies that the compiler died due to a delayed bug rather than a failed
|
|
|
|
/// assertion, etc.
|
2022-12-31 01:56:59 +00:00
|
|
|
pub struct DelayedBugPanic;
|
2015-12-15 14:11:27 +13:00
|
|
|
|
2023-12-20 10:43:41 +11:00
|
|
|
/// A `DiagCtxt` deals with errors and other compiler output.
|
2019-05-02 05:06:33 +03:00
|
|
|
/// Certain errors (fatal, bug, unimpl) may cause immediate exit,
|
|
|
|
/// others log errors for later reporting.
|
2023-12-17 21:48:57 +11:00
|
|
|
pub struct DiagCtxt {
|
2023-12-17 21:58:27 +11:00
|
|
|
inner: Lock<DiagCtxtInner>,
|
2019-09-07 12:09:52 -04:00
|
|
|
}
|
2017-11-20 18:03:20 +00:00
|
|
|
|
2019-09-23 22:28:14 +02:00
|
|
|
/// This inner struct exists to keep it all behind a single lock;
|
|
|
|
/// this is done to prevent possible deadlocks in a multi-threaded compiler,
|
|
|
|
/// as well as inconsistent state observation.
|
2023-12-17 21:58:27 +11:00
|
|
|
struct DiagCtxtInner {
|
2023-12-18 08:47:03 +11:00
|
|
|
flags: DiagCtxtFlags,
|
2024-01-09 14:44:03 +11:00
|
|
|
|
2024-02-09 16:12:18 +11:00
|
|
|
/// The error guarantees from all emitted errors. The length gives the error count.
|
|
|
|
err_guars: Vec<ErrorGuaranteed>,
|
|
|
|
/// The error guarantee from all emitted lint errors. The length gives the
|
|
|
|
/// lint error count.
|
|
|
|
lint_err_guars: Vec<ErrorGuaranteed>,
|
|
|
|
/// The delayed bugs and their error guarantees.
|
|
|
|
delayed_bugs: Vec<(DelayedDiagnostic, ErrorGuaranteed)>,
|
2024-01-15 10:35:24 +11:00
|
|
|
|
Fix `ErrorGuaranteed` unsoundness with stash/steal.
When you stash an error, the error count is incremented. You can then
use the non-zero error count to get an `ErrorGuaranteed`. You can then
steal the error, which decrements the error count. You can then cancel
the error.
Example code:
```
fn unsound(dcx: &DiagCtxt) -> ErrorGuaranteed {
let sp = rustc_span::DUMMY_SP;
let k = rustc_errors::StashKey::Cycle;
dcx.struct_err("bogus").stash(sp, k); // increment error count on stash
let guar = dcx.has_errors().unwrap(); // ErrorGuaranteed from error count > 0
let err = dcx.steal_diagnostic(sp, k).unwrap(); // decrement error count on steal
err.cancel(); // cancel error
guar // ErrorGuaranteed with no error emitted!
}
```
This commit fixes the problem in the simplest way: by not counting
stashed errors in `DiagCtxt::{err_count,has_errors}`.
However, just doing this without any other changes leads to over 40 ui
test failures. Mostly because of uninteresting extra errors (many saying
"type annotations needed" when type inference fails), and in a few
cases, due to delayed bugs causing ICEs when no normal errors are
printed.
To fix these, this commit adds `DiagCtxt::stashed_err_count`, and uses
it in three places alongside `DiagCtxt::{has_errors,err_count}`. It's
dodgy to rely on it, because unlike `DiagCtxt::err_count` it can go up
and down. But it's needed to preserve existing behaviour, and at least
the three places that need it are now obvious.
2024-02-09 06:42:50 +11:00
|
|
|
/// The number of stashed errors. Unlike the other counts, this can go up
|
|
|
|
/// and down, so it doesn't guarantee anything.
|
|
|
|
stashed_err_count: usize,
|
|
|
|
|
2024-01-15 10:35:24 +11:00
|
|
|
/// The error count shown to the user at the end.
|
2019-09-07 12:09:52 -04:00
|
|
|
deduplicated_err_count: usize,
|
2024-01-15 10:35:24 +11:00
|
|
|
/// The warning count shown to the user at the end.
|
2024-01-09 14:44:03 +11:00
|
|
|
deduplicated_warn_count: usize,
|
2024-01-15 10:35:24 +11:00
|
|
|
|
2024-02-12 16:48:45 +11:00
|
|
|
emitter: Box<DynEmitter>,
|
|
|
|
|
|
|
|
/// Must we produce a diagnostic to justify the use of the expensive
|
|
|
|
/// `trimmed_def_paths` function?
|
|
|
|
must_produce_diag: bool,
|
|
|
|
|
2024-01-09 14:39:22 +11:00
|
|
|
/// Has this diagnostic context printed any diagnostics? (I.e. has
|
|
|
|
/// `self.emitter.emit_diagnostic()` been called?
|
|
|
|
has_printed: bool,
|
2024-01-09 14:44:03 +11:00
|
|
|
|
2022-06-04 00:43:24 +02:00
|
|
|
/// This flag indicates that an expected diagnostic was emitted and suppressed.
|
2024-02-12 16:48:45 +11:00
|
|
|
/// This is used for the `must_produce_diag` check.
|
2022-06-04 00:43:24 +02:00
|
|
|
suppressed_expected_diag: bool,
|
2017-10-25 15:01:06 +02:00
|
|
|
|
2024-01-13 13:11:56 +11:00
|
|
|
/// This set contains the code of all emitted diagnostics to avoid
|
2019-04-17 12:03:39 +03:00
|
|
|
/// emitting the same diagnostic with extended help (`--teach`) twice, which
|
2021-04-19 15:57:08 +03:00
|
|
|
/// would be unnecessary repetition.
|
Stop using `String` for error codes.
Error codes are integers, but `String` is used everywhere to represent
them. Gross!
This commit introduces `ErrCode`, an integral newtype for error codes,
replacing `String`. It also introduces a constant for every error code,
e.g. `E0123`, and removes the `error_code!` macro. The constants are
imported wherever used with `use rustc_errors::codes::*`.
With the old code, we have three different ways to specify an error code
at a use point:
```
error_code!(E0123) // macro call
struct_span_code_err!(dcx, span, E0123, "msg"); // bare ident arg to macro call
\#[diag(name, code = "E0123")] // string
struct Diag;
```
With the new code, they all use the `E0123` constant.
```
E0123 // constant
struct_span_code_err!(dcx, span, E0123, "msg"); // constant
\#[diag(name, code = E0123)] // constant
struct Diag;
```
The commit also changes the structure of the error code definitions:
- `rustc_error_codes` now just defines a higher-order macro listing the
used error codes and nothing else.
- Because that's now the only thing in the `rustc_error_codes` crate, I
moved it into the `lib.rs` file and removed the `error_codes.rs` file.
- `rustc_errors` uses that macro to define everything, e.g. the error
code constants and the `DIAGNOSTIC_TABLES`. This is in its new
`codes.rs` file.
2024-01-14 10:57:07 +11:00
|
|
|
taught_diagnostics: FxHashSet<ErrCode>,
|
2018-03-03 06:20:26 +01:00
|
|
|
|
2022-10-08 14:42:38 +02:00
|
|
|
/// Used to suggest rustc --explain `<error code>`
|
Stop using `String` for error codes.
Error codes are integers, but `String` is used everywhere to represent
them. Gross!
This commit introduces `ErrCode`, an integral newtype for error codes,
replacing `String`. It also introduces a constant for every error code,
e.g. `E0123`, and removes the `error_code!` macro. The constants are
imported wherever used with `use rustc_errors::codes::*`.
With the old code, we have three different ways to specify an error code
at a use point:
```
error_code!(E0123) // macro call
struct_span_code_err!(dcx, span, E0123, "msg"); // bare ident arg to macro call
\#[diag(name, code = "E0123")] // string
struct Diag;
```
With the new code, they all use the `E0123` constant.
```
E0123 // constant
struct_span_code_err!(dcx, span, E0123, "msg"); // constant
\#[diag(name, code = E0123)] // constant
struct Diag;
```
The commit also changes the structure of the error code definitions:
- `rustc_error_codes` now just defines a higher-order macro listing the
used error codes and nothing else.
- Because that's now the only thing in the `rustc_error_codes` crate, I
moved it into the `lib.rs` file and removed the `error_codes.rs` file.
- `rustc_errors` uses that macro to define everything, e.g. the error
code constants and the `DIAGNOSTIC_TABLES`. This is in its new
`codes.rs` file.
2024-01-14 10:57:07 +11:00
|
|
|
emitted_diagnostic_codes: FxIndexSet<ErrCode>,
|
2017-10-25 15:01:06 +02:00
|
|
|
|
2019-04-17 12:03:39 +03:00
|
|
|
/// This set contains a hash of every diagnostic that has been emitted by
|
2023-12-20 10:43:41 +11:00
|
|
|
/// this `DiagCtxt`. These hashes is used to avoid emitting the same error
|
2019-04-17 12:03:39 +03:00
|
|
|
/// twice.
|
2023-04-07 23:11:20 -04:00
|
|
|
emitted_diagnostics: FxHashSet<Hash128>,
|
2019-09-23 04:45:21 +02:00
|
|
|
|
|
|
|
/// Stashed diagnostics emitted in one stage of the compiler that may be
|
Overhaul the handling of errors at the top-level.
Currently `emit_stashed_diagnostic` is called from four(!) different
places: `print_error_count`, `DiagCtxtInner::drop`, `abort_if_errors`,
and `compile_status`.
And `flush_delayed` is called from two different places:
`DiagCtxtInner::drop` and `Queries`.
This is pretty gross! Each one should really be called from a single
place, but there's a bunch of entanglements. This commit cleans up this
mess.
Specifically, it:
- Removes all the existing calls to `emit_stashed_diagnostic`, and adds
a single new call in `finish_diagnostics`.
- Removes the early `flush_delayed` call in `codegen_and_build_linker`,
replacing it with a simple early return if delayed bugs are present.
- Changes `DiagCtxtInner::drop` and `DiagCtxtInner::flush_delayed` so
they both assert that the stashed diagnostics are empty (i.e.
processed beforehand).
- Changes `interface::run_compiler` so that any errors emitted during
`finish_diagnostics` (i.e. late-emitted stashed diagnostics) are
counted and cannot be overlooked. This requires adding
`ErrorGuaranteed` return values to several functions.
- Removes the `stashed_err_count` call in `analysis`. This is possible
now that we don't have to worry about calling `flush_delayed` early
from `codegen_and_build_linker` when stashed diagnostics are pending.
- Changes the `span_bug` case in `handle_tuple_field_pattern_match` to a
`delayed_span_bug`, because it now can be reached due to the removal
of the `stashed_err_count` call in `analysis`.
- Slightly changes the expected output of three tests. If no errors are
emitted but there are delayed bugs, the error count is no longer
printed. This is because delayed bugs are now always printed after the
error count is printed (or not printed, if the error count is zero).
There is a lot going on in this commit. It's hard to break into smaller
pieces because the existing code is very tangled. It took me a long time
and a lot of effort to understand how the different pieces interact, and
I think the new code is a lot simpler and easier to understand.
2024-02-19 10:00:19 +11:00
|
|
|
/// stolen and emitted/cancelled by other stages (e.g. to improve them and
|
|
|
|
/// add more information). All stashed diagnostics must be emitted with
|
|
|
|
/// `emit_stashed_diagnostics` by the time the `DiagCtxtInner` is dropped,
|
|
|
|
/// otherwise an assertion failure will occur.
|
2019-09-23 04:45:21 +02:00
|
|
|
stashed_diagnostics: FxIndexMap<(Span, StashKey), Diagnostic>,
|
2020-03-11 16:30:09 +01:00
|
|
|
|
2020-08-13 15:41:52 -04:00
|
|
|
future_breakage_diagnostics: Vec<Diagnostic>,
|
2021-08-06 23:28:58 +02:00
|
|
|
|
2022-04-05 18:23:38 +02:00
|
|
|
/// The [`Self::unstable_expect_diagnostics`] should be empty when this struct is
|
2022-03-29 00:42:41 +02:00
|
|
|
/// dropped. However, it can have values if the compilation is stopped early
|
|
|
|
/// or is only partially executed. To avoid ICEs, like in rust#94953 we only
|
2022-04-05 18:23:38 +02:00
|
|
|
/// check if [`Self::unstable_expect_diagnostics`] is empty, if the expectation ids
|
2022-03-29 00:42:41 +02:00
|
|
|
/// have been converted.
|
|
|
|
check_unstable_expect_diagnostics: bool,
|
|
|
|
|
2023-07-03 08:39:44 +08:00
|
|
|
/// Expected [`Diagnostic`][struct@diagnostic::Diagnostic]s store a [`LintExpectationId`] as part of
|
2021-11-20 20:45:27 +01:00
|
|
|
/// the lint level. [`LintExpectationId`]s created early during the compilation
|
|
|
|
/// (before `HirId`s have been defined) are not stable and can therefore not be
|
|
|
|
/// stored on disk. This buffer stores these diagnostics until the ID has been
|
2023-07-03 08:39:44 +08:00
|
|
|
/// replaced by a stable [`LintExpectationId`]. The [`Diagnostic`][struct@diagnostic::Diagnostic]s are the
|
2021-11-20 20:45:27 +01:00
|
|
|
/// submitted for storage and added to the list of fulfilled expectations.
|
|
|
|
unstable_expect_diagnostics: Vec<Diagnostic>,
|
|
|
|
|
2021-08-06 23:28:58 +02:00
|
|
|
/// expected diagnostic will have the level `Expect` which additionally
|
|
|
|
/// carries the [`LintExpectationId`] of the expectation that can be
|
|
|
|
/// marked as fulfilled. This is a collection of all [`LintExpectationId`]s
|
|
|
|
/// that have been marked as fulfilled this way.
|
|
|
|
///
|
|
|
|
/// [RFC-2383]: https://rust-lang.github.io/rfcs/2383-lint-reasons.html
|
|
|
|
fulfilled_expectations: FxHashSet<LintExpectationId>,
|
2023-03-03 22:25:18 +00:00
|
|
|
|
|
|
|
/// The file where the ICE information is stored. This allows delayed_span_bug backtraces to be
|
|
|
|
/// stored along side the main panic backtrace.
|
|
|
|
ice_file: Option<PathBuf>,
|
2019-09-23 04:45:21 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/// A key denoting where from a diagnostic was stashed.
|
2022-09-08 06:15:33 +09:00
|
|
|
#[derive(Copy, Clone, PartialEq, Eq, Hash)]
|
2019-09-23 04:45:21 +02:00
|
|
|
pub enum StashKey {
|
|
|
|
ItemNoType,
|
2022-08-16 00:16:14 +09:00
|
|
|
UnderscoreForArrayLengths,
|
2022-08-17 06:52:47 -05:00
|
|
|
EarlySyntaxWarning,
|
2022-10-05 05:35:34 +00:00
|
|
|
CallIntoMethod,
|
2022-09-01 18:48:09 +00:00
|
|
|
/// When an invalid lifetime e.g. `'2` should be reinterpreted
|
|
|
|
/// as a char literal in the parser
|
|
|
|
LifetimeIsChar,
|
2022-11-16 19:10:38 +00:00
|
|
|
/// Maybe there was a typo where a comma was forgotten before
|
|
|
|
/// FRU syntax
|
|
|
|
MaybeFruTypo,
|
2022-09-18 15:35:21 +08:00
|
|
|
CallAssocMethod,
|
2023-05-17 16:59:39 +08:00
|
|
|
TraitMissingMethod,
|
2024-02-14 12:42:32 -08:00
|
|
|
AssociatedTypeSuggestion,
|
2023-05-22 23:33:34 +00:00
|
|
|
OpaqueHiddenTypeMismatch,
|
2023-08-20 00:56:22 +08:00
|
|
|
MaybeForgetReturn,
|
2023-10-26 17:30:53 +00:00
|
|
|
/// Query cycle detected, stashing in favor of a better error.
|
|
|
|
Cycle,
|
2024-01-27 19:09:55 +08:00
|
|
|
UndeterminedMacroResolution,
|
2015-12-15 14:11:27 +13:00
|
|
|
}
|
|
|
|
|
2024-01-08 08:27:38 +11:00
|
|
|
fn default_track_diagnostic(diag: Diagnostic, f: &mut dyn FnMut(Diagnostic)) {
|
|
|
|
(*f)(diag)
|
2021-04-30 19:38:06 +02:00
|
|
|
}
|
2018-03-15 10:03:36 +01:00
|
|
|
|
2024-01-09 12:35:03 +11:00
|
|
|
pub static TRACK_DIAGNOSTIC: AtomicRef<fn(Diagnostic, &mut dyn FnMut(Diagnostic))> =
|
2021-04-30 19:38:06 +02:00
|
|
|
AtomicRef::new(&(default_track_diagnostic as _));
|
2018-03-15 10:03:36 +01:00
|
|
|
|
2019-09-07 12:09:52 -04:00
|
|
|
#[derive(Copy, Clone, Default)]
|
2023-12-18 08:47:03 +11:00
|
|
|
pub struct DiagCtxtFlags {
|
2018-09-15 06:27:55 +02:00
|
|
|
/// If false, warning-level lints are suppressed.
|
|
|
|
/// (rustc: see `--allow warnings` and `--cap-lints`)
|
2017-11-20 18:03:20 +00:00
|
|
|
pub can_emit_warnings: bool,
|
2023-09-22 13:33:55 +02:00
|
|
|
/// If Some, the Nth error-level diagnostic is upgraded to bug-level.
|
2018-09-15 06:27:55 +02:00
|
|
|
/// (rustc: see `-Z treat-err-as-bug`)
|
2024-01-29 23:59:09 +01:00
|
|
|
pub treat_err_as_bug: Option<NonZero<usize>>,
|
2024-01-12 00:30:04 +00:00
|
|
|
/// Eagerly emit delayed bugs as errors, so that the compiler debugger may
|
|
|
|
/// see all of the errors being emitted at once.
|
|
|
|
pub eagerly_emit_delayed_bugs: bool,
|
2019-12-15 17:12:30 +02:00
|
|
|
/// Show macro backtraces.
|
|
|
|
/// (rustc: see `-Z macro-backtrace`)
|
|
|
|
pub macro_backtrace: bool,
|
2019-12-29 22:10:47 +03:00
|
|
|
/// If true, identical diagnostics are reported only once.
|
|
|
|
pub deduplicate_diagnostics: bool,
|
2022-10-19 00:08:20 +02:00
|
|
|
/// Track where errors are created. Enabled with `-Ztrack-diagnostics`.
|
|
|
|
pub track_diagnostics: bool,
|
2017-11-20 18:03:20 +00:00
|
|
|
}
|
|
|
|
|
2023-12-17 21:58:27 +11:00
|
|
|
impl Drop for DiagCtxtInner {
|
2018-07-19 17:53:44 +02:00
|
|
|
fn drop(&mut self) {
|
Overhaul the handling of errors at the top-level.
Currently `emit_stashed_diagnostic` is called from four(!) different
places: `print_error_count`, `DiagCtxtInner::drop`, `abort_if_errors`,
and `compile_status`.
And `flush_delayed` is called from two different places:
`DiagCtxtInner::drop` and `Queries`.
This is pretty gross! Each one should really be called from a single
place, but there's a bunch of entanglements. This commit cleans up this
mess.
Specifically, it:
- Removes all the existing calls to `emit_stashed_diagnostic`, and adds
a single new call in `finish_diagnostics`.
- Removes the early `flush_delayed` call in `codegen_and_build_linker`,
replacing it with a simple early return if delayed bugs are present.
- Changes `DiagCtxtInner::drop` and `DiagCtxtInner::flush_delayed` so
they both assert that the stashed diagnostics are empty (i.e.
processed beforehand).
- Changes `interface::run_compiler` so that any errors emitted during
`finish_diagnostics` (i.e. late-emitted stashed diagnostics) are
counted and cannot be overlooked. This requires adding
`ErrorGuaranteed` return values to several functions.
- Removes the `stashed_err_count` call in `analysis`. This is possible
now that we don't have to worry about calling `flush_delayed` early
from `codegen_and_build_linker` when stashed diagnostics are pending.
- Changes the `span_bug` case in `handle_tuple_field_pattern_match` to a
`delayed_span_bug`, because it now can be reached due to the removal
of the `stashed_err_count` call in `analysis`.
- Slightly changes the expected output of three tests. If no errors are
emitted but there are delayed bugs, the error count is no longer
printed. This is because delayed bugs are now always printed after the
error count is printed (or not printed, if the error count is zero).
There is a lot going on in this commit. It's hard to break into smaller
pieces because the existing code is very tangled. It took me a long time
and a lot of effort to understand how the different pieces interact, and
I think the new code is a lot simpler and easier to understand.
2024-02-19 10:00:19 +11:00
|
|
|
// Any stashed diagnostics should have been handled by
|
|
|
|
// `emit_stashed_diagnostics` by now.
|
|
|
|
assert!(self.stashed_diagnostics.is_empty());
|
2019-09-23 04:45:21 +02:00
|
|
|
|
2024-02-09 16:12:18 +11:00
|
|
|
if self.err_guars.is_empty() {
|
2024-02-12 16:48:45 +11:00
|
|
|
self.flush_delayed()
|
2020-08-22 22:24:48 +03:00
|
|
|
}
|
|
|
|
|
2024-01-09 14:39:22 +11:00
|
|
|
if !self.has_printed && !self.suppressed_expected_diag && !std::thread::panicking() {
|
2024-02-12 16:48:45 +11:00
|
|
|
if self.must_produce_diag {
|
|
|
|
panic!(
|
|
|
|
"must_produce_diag: trimmed_def_paths called but no diagnostics emitted; \
|
|
|
|
use `DelayDm` for lints or `with_no_trimmed_paths` for debugging"
|
|
|
|
);
|
|
|
|
}
|
2018-07-19 17:53:44 +02:00
|
|
|
}
|
2022-03-05 21:54:49 +01:00
|
|
|
|
2022-03-29 00:42:41 +02:00
|
|
|
if self.check_unstable_expect_diagnostics {
|
|
|
|
assert!(
|
|
|
|
self.unstable_expect_diagnostics.is_empty(),
|
|
|
|
"all diagnostics with unstable expectations should have been converted",
|
|
|
|
);
|
|
|
|
}
|
2018-07-19 17:53:44 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-12-17 21:48:57 +11:00
|
|
|
impl DiagCtxt {
|
2019-09-23 22:28:14 +02:00
|
|
|
pub fn with_tty_emitter(
|
2020-02-22 16:07:05 +02:00
|
|
|
sm: Option<Lrc<SourceMap>>,
|
2022-04-12 09:34:40 +01:00
|
|
|
fallback_bundle: LazyFallbackBundle,
|
2019-09-23 22:28:14 +02:00
|
|
|
) -> Self {
|
2024-01-05 10:02:40 +11:00
|
|
|
let emitter = Box::new(HumanEmitter::stderr(ColorConfig::Auto, fallback_bundle).sm(sm));
|
2023-07-25 10:27:34 +00:00
|
|
|
Self::with_emitter(emitter)
|
|
|
|
}
|
|
|
|
pub fn disable_warnings(mut self) -> Self {
|
|
|
|
self.inner.get_mut().flags.can_emit_warnings = false;
|
|
|
|
self
|
2019-09-23 22:28:14 +02:00
|
|
|
}
|
|
|
|
|
2023-12-18 08:47:03 +11:00
|
|
|
pub fn with_flags(mut self, flags: DiagCtxtFlags) -> Self {
|
2023-07-25 10:27:34 +00:00
|
|
|
self.inner.get_mut().flags = flags;
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn with_ice_file(mut self, ice_file: PathBuf) -> Self {
|
|
|
|
self.inner.get_mut().ice_file = Some(ice_file);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2020-10-31 03:14:32 +01:00
|
|
|
pub fn with_emitter(emitter: Box<DynEmitter>) -> Self {
|
2019-09-23 22:28:14 +02:00
|
|
|
Self {
|
2023-12-17 21:58:27 +11:00
|
|
|
inner: Lock::new(DiagCtxtInner {
|
2023-12-18 08:47:03 +11:00
|
|
|
flags: DiagCtxtFlags { can_emit_warnings: true, ..Default::default() },
|
2024-02-09 16:12:18 +11:00
|
|
|
err_guars: Vec::new(),
|
|
|
|
lint_err_guars: Vec::new(),
|
|
|
|
delayed_bugs: Vec::new(),
|
Fix `ErrorGuaranteed` unsoundness with stash/steal.
When you stash an error, the error count is incremented. You can then
use the non-zero error count to get an `ErrorGuaranteed`. You can then
steal the error, which decrements the error count. You can then cancel
the error.
Example code:
```
fn unsound(dcx: &DiagCtxt) -> ErrorGuaranteed {
let sp = rustc_span::DUMMY_SP;
let k = rustc_errors::StashKey::Cycle;
dcx.struct_err("bogus").stash(sp, k); // increment error count on stash
let guar = dcx.has_errors().unwrap(); // ErrorGuaranteed from error count > 0
let err = dcx.steal_diagnostic(sp, k).unwrap(); // decrement error count on steal
err.cancel(); // cancel error
guar // ErrorGuaranteed with no error emitted!
}
```
This commit fixes the problem in the simplest way: by not counting
stashed errors in `DiagCtxt::{err_count,has_errors}`.
However, just doing this without any other changes leads to over 40 ui
test failures. Mostly because of uninteresting extra errors (many saying
"type annotations needed" when type inference fails), and in a few
cases, due to delayed bugs causing ICEs when no normal errors are
printed.
To fix these, this commit adds `DiagCtxt::stashed_err_count`, and uses
it in three places alongside `DiagCtxt::{has_errors,err_count}`. It's
dodgy to rely on it, because unlike `DiagCtxt::err_count` it can go up
and down. But it's needed to preserve existing behaviour, and at least
the three places that need it are now obvious.
2024-02-09 06:42:50 +11:00
|
|
|
stashed_err_count: 0,
|
2019-09-07 12:09:52 -04:00
|
|
|
deduplicated_err_count: 0,
|
2020-03-11 16:30:09 +01:00
|
|
|
deduplicated_warn_count: 0,
|
2020-10-31 03:14:32 +01:00
|
|
|
emitter,
|
2024-02-12 16:48:45 +11:00
|
|
|
must_produce_diag: false,
|
|
|
|
has_printed: false,
|
2022-06-04 00:43:24 +02:00
|
|
|
suppressed_expected_diag: false,
|
2019-09-07 12:09:52 -04:00
|
|
|
taught_diagnostics: Default::default(),
|
|
|
|
emitted_diagnostic_codes: Default::default(),
|
|
|
|
emitted_diagnostics: Default::default(),
|
2019-09-23 04:45:21 +02:00
|
|
|
stashed_diagnostics: Default::default(),
|
2020-08-13 15:41:52 -04:00
|
|
|
future_breakage_diagnostics: Vec::new(),
|
2022-03-29 00:42:41 +02:00
|
|
|
check_unstable_expect_diagnostics: false,
|
2021-11-20 20:45:27 +01:00
|
|
|
unstable_expect_diagnostics: Vec::new(),
|
2021-08-06 23:28:58 +02:00
|
|
|
fulfilled_expectations: Default::default(),
|
2023-07-25 10:27:34 +00:00
|
|
|
ice_file: None,
|
2019-09-07 12:09:52 -04:00
|
|
|
}),
|
2015-12-15 14:11:27 +13:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-08-19 14:48:15 +01:00
|
|
|
/// Translate `message` eagerly with `args` to `SubdiagnosticMessage::Eager`.
|
2022-10-03 14:14:51 +01:00
|
|
|
pub fn eagerly_translate<'a>(
|
|
|
|
&self,
|
|
|
|
message: DiagnosticMessage,
|
2024-01-30 16:06:18 +11:00
|
|
|
args: impl Iterator<Item = DiagnosticArg<'a>>,
|
2022-10-03 14:14:51 +01:00
|
|
|
) -> SubdiagnosticMessage {
|
2024-02-14 14:17:27 +00:00
|
|
|
let inner = self.inner.borrow();
|
|
|
|
inner.eagerly_translate(message, args)
|
2022-08-19 14:48:15 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Translate `message` eagerly with `args` to `String`.
|
|
|
|
pub fn eagerly_translate_to_string<'a>(
|
|
|
|
&self,
|
|
|
|
message: DiagnosticMessage,
|
2024-01-30 16:06:18 +11:00
|
|
|
args: impl Iterator<Item = DiagnosticArg<'a>>,
|
2022-08-19 14:48:15 +01:00
|
|
|
) -> String {
|
2022-10-03 14:14:51 +01:00
|
|
|
let inner = self.inner.borrow();
|
2024-02-14 14:17:27 +00:00
|
|
|
inner.eagerly_translate_to_string(message, args)
|
2022-10-03 14:14:51 +01:00
|
|
|
}
|
|
|
|
|
2019-09-07 12:09:52 -04:00
|
|
|
// This is here to not allow mutation of flags;
|
2024-01-05 02:52:37 +00:00
|
|
|
// as of this writing it's used in Session::consider_optimizing and
|
|
|
|
// in tests in rustc_interface.
|
2019-09-07 12:09:52 -04:00
|
|
|
pub fn can_emit_warnings(&self) -> bool {
|
2023-12-01 08:23:34 +11:00
|
|
|
self.inner.borrow_mut().flags.can_emit_warnings
|
2016-03-25 18:17:04 +01:00
|
|
|
}
|
|
|
|
|
2018-01-06 13:33:20 +01:00
|
|
|
/// Resets the diagnostic error count as well as the cached emitted diagnostics.
|
|
|
|
///
|
2019-02-08 14:53:55 +01:00
|
|
|
/// NOTE: *do not* call this function from rustc. It is only meant to be called from external
|
2018-01-06 13:33:20 +01:00
|
|
|
/// tools that want to reuse a `Parser` cleaning the previously emitted diagnostics as well as
|
|
|
|
/// the overall count of emitted error diagnostics.
|
2017-08-10 09:17:03 +09:00
|
|
|
pub fn reset_err_count(&self) {
|
2024-02-13 16:19:40 +11:00
|
|
|
// Use destructuring so that if a field gets added to `DiagCtxtInner`, it's impossible to
|
|
|
|
// fail to update this method as well.
|
2019-09-07 12:09:52 -04:00
|
|
|
let mut inner = self.inner.borrow_mut();
|
2024-02-13 16:19:40 +11:00
|
|
|
let DiagCtxtInner {
|
|
|
|
flags: _,
|
|
|
|
err_guars,
|
|
|
|
lint_err_guars,
|
|
|
|
delayed_bugs,
|
|
|
|
stashed_err_count,
|
|
|
|
deduplicated_err_count,
|
|
|
|
deduplicated_warn_count,
|
|
|
|
emitter: _,
|
|
|
|
must_produce_diag,
|
|
|
|
has_printed,
|
|
|
|
suppressed_expected_diag,
|
|
|
|
taught_diagnostics,
|
|
|
|
emitted_diagnostic_codes,
|
|
|
|
emitted_diagnostics,
|
|
|
|
stashed_diagnostics,
|
|
|
|
future_breakage_diagnostics,
|
|
|
|
check_unstable_expect_diagnostics,
|
|
|
|
unstable_expect_diagnostics,
|
|
|
|
fulfilled_expectations,
|
|
|
|
ice_file: _,
|
|
|
|
} = inner.deref_mut();
|
|
|
|
|
|
|
|
// For the `Vec`s and `HashMap`s, we overwrite with an empty container to free the
|
|
|
|
// underlying memory (which `clear` would not do).
|
|
|
|
*err_guars = Default::default();
|
|
|
|
*lint_err_guars = Default::default();
|
|
|
|
*delayed_bugs = Default::default();
|
|
|
|
*stashed_err_count = 0;
|
|
|
|
*deduplicated_err_count = 0;
|
|
|
|
*deduplicated_warn_count = 0;
|
|
|
|
*must_produce_diag = false;
|
|
|
|
*has_printed = false;
|
|
|
|
*suppressed_expected_diag = false;
|
|
|
|
*taught_diagnostics = Default::default();
|
|
|
|
*emitted_diagnostic_codes = Default::default();
|
|
|
|
*emitted_diagnostics = Default::default();
|
|
|
|
*stashed_diagnostics = Default::default();
|
|
|
|
*future_breakage_diagnostics = Default::default();
|
|
|
|
*check_unstable_expect_diagnostics = false;
|
|
|
|
*unstable_expect_diagnostics = Default::default();
|
|
|
|
*fulfilled_expectations = Default::default();
|
2019-09-23 04:45:21 +02:00
|
|
|
}
|
|
|
|
|
2022-11-16 12:21:15 -06:00
|
|
|
/// Stash a given diagnostic with the given `Span` and [`StashKey`] as the key.
|
|
|
|
/// Retrieve a stashed diagnostic with `steal_diagnostic`.
|
2019-09-23 04:45:21 +02:00
|
|
|
pub fn stash_diagnostic(&self, span: Span, key: StashKey, diag: Diagnostic) {
|
2023-12-04 14:06:28 +11:00
|
|
|
let mut inner = self.inner.borrow_mut();
|
|
|
|
|
|
|
|
let key = (span.with_parent(None), key);
|
|
|
|
|
|
|
|
if diag.is_error() {
|
Fix `ErrorGuaranteed` unsoundness with stash/steal.
When you stash an error, the error count is incremented. You can then
use the non-zero error count to get an `ErrorGuaranteed`. You can then
steal the error, which decrements the error count. You can then cancel
the error.
Example code:
```
fn unsound(dcx: &DiagCtxt) -> ErrorGuaranteed {
let sp = rustc_span::DUMMY_SP;
let k = rustc_errors::StashKey::Cycle;
dcx.struct_err("bogus").stash(sp, k); // increment error count on stash
let guar = dcx.has_errors().unwrap(); // ErrorGuaranteed from error count > 0
let err = dcx.steal_diagnostic(sp, k).unwrap(); // decrement error count on steal
err.cancel(); // cancel error
guar // ErrorGuaranteed with no error emitted!
}
```
This commit fixes the problem in the simplest way: by not counting
stashed errors in `DiagCtxt::{err_count,has_errors}`.
However, just doing this without any other changes leads to over 40 ui
test failures. Mostly because of uninteresting extra errors (many saying
"type annotations needed" when type inference fails), and in a few
cases, due to delayed bugs causing ICEs when no normal errors are
printed.
To fix these, this commit adds `DiagCtxt::stashed_err_count`, and uses
it in three places alongside `DiagCtxt::{has_errors,err_count}`. It's
dodgy to rely on it, because unlike `DiagCtxt::err_count` it can go up
and down. But it's needed to preserve existing behaviour, and at least
the three places that need it are now obvious.
2024-02-09 06:42:50 +11:00
|
|
|
if diag.is_lint.is_none() {
|
|
|
|
inner.stashed_err_count += 1;
|
2023-12-04 14:06:28 +11:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// FIXME(Centril, #69537): Consider reintroducing panic on overwriting a stashed diagnostic
|
|
|
|
// if/when we have a more robust macro-friendly replacement for `(span, key)` as a key.
|
|
|
|
// See the PR for a discussion.
|
|
|
|
inner.stashed_diagnostics.insert(key, diag);
|
2019-09-23 04:45:21 +02:00
|
|
|
}
|
|
|
|
|
2022-11-16 12:21:15 -06:00
|
|
|
/// Steal a previously stashed diagnostic with the given `Span` and [`StashKey`] as the key.
|
2022-01-27 09:44:25 +00:00
|
|
|
pub fn steal_diagnostic(&self, span: Span, key: StashKey) -> Option<DiagnosticBuilder<'_, ()>> {
|
2023-12-04 14:06:28 +11:00
|
|
|
let mut inner = self.inner.borrow_mut();
|
|
|
|
let key = (span.with_parent(None), key);
|
2024-01-28 20:53:28 +00:00
|
|
|
// FIXME(#120456) - is `swap_remove` correct?
|
|
|
|
let diag = inner.stashed_diagnostics.swap_remove(&key)?;
|
2023-12-04 14:06:28 +11:00
|
|
|
if diag.is_error() {
|
Fix `ErrorGuaranteed` unsoundness with stash/steal.
When you stash an error, the error count is incremented. You can then
use the non-zero error count to get an `ErrorGuaranteed`. You can then
steal the error, which decrements the error count. You can then cancel
the error.
Example code:
```
fn unsound(dcx: &DiagCtxt) -> ErrorGuaranteed {
let sp = rustc_span::DUMMY_SP;
let k = rustc_errors::StashKey::Cycle;
dcx.struct_err("bogus").stash(sp, k); // increment error count on stash
let guar = dcx.has_errors().unwrap(); // ErrorGuaranteed from error count > 0
let err = dcx.steal_diagnostic(sp, k).unwrap(); // decrement error count on steal
err.cancel(); // cancel error
guar // ErrorGuaranteed with no error emitted!
}
```
This commit fixes the problem in the simplest way: by not counting
stashed errors in `DiagCtxt::{err_count,has_errors}`.
However, just doing this without any other changes leads to over 40 ui
test failures. Mostly because of uninteresting extra errors (many saying
"type annotations needed" when type inference fails), and in a few
cases, due to delayed bugs causing ICEs when no normal errors are
printed.
To fix these, this commit adds `DiagCtxt::stashed_err_count`, and uses
it in three places alongside `DiagCtxt::{has_errors,err_count}`. It's
dodgy to rely on it, because unlike `DiagCtxt::err_count` it can go up
and down. But it's needed to preserve existing behaviour, and at least
the three places that need it are now obvious.
2024-02-09 06:42:50 +11:00
|
|
|
if diag.is_lint.is_none() {
|
|
|
|
inner.stashed_err_count -= 1;
|
2023-12-04 14:06:28 +11:00
|
|
|
}
|
|
|
|
}
|
|
|
|
Some(DiagnosticBuilder::new_diagnostic(self, diag))
|
2019-09-23 04:45:21 +02:00
|
|
|
}
|
|
|
|
|
2022-09-16 11:24:14 +09:00
|
|
|
pub fn has_stashed_diagnostic(&self, span: Span, key: StashKey) -> bool {
|
2021-04-30 23:57:02 +02:00
|
|
|
self.inner.borrow().stashed_diagnostics.get(&(span.with_parent(None), key)).is_some()
|
2022-09-16 11:24:14 +09:00
|
|
|
}
|
|
|
|
|
2019-09-23 04:45:21 +02:00
|
|
|
/// Emit all stashed diagnostics.
|
Overhaul the handling of errors at the top-level.
Currently `emit_stashed_diagnostic` is called from four(!) different
places: `print_error_count`, `DiagCtxtInner::drop`, `abort_if_errors`,
and `compile_status`.
And `flush_delayed` is called from two different places:
`DiagCtxtInner::drop` and `Queries`.
This is pretty gross! Each one should really be called from a single
place, but there's a bunch of entanglements. This commit cleans up this
mess.
Specifically, it:
- Removes all the existing calls to `emit_stashed_diagnostic`, and adds
a single new call in `finish_diagnostics`.
- Removes the early `flush_delayed` call in `codegen_and_build_linker`,
replacing it with a simple early return if delayed bugs are present.
- Changes `DiagCtxtInner::drop` and `DiagCtxtInner::flush_delayed` so
they both assert that the stashed diagnostics are empty (i.e.
processed beforehand).
- Changes `interface::run_compiler` so that any errors emitted during
`finish_diagnostics` (i.e. late-emitted stashed diagnostics) are
counted and cannot be overlooked. This requires adding
`ErrorGuaranteed` return values to several functions.
- Removes the `stashed_err_count` call in `analysis`. This is possible
now that we don't have to worry about calling `flush_delayed` early
from `codegen_and_build_linker` when stashed diagnostics are pending.
- Changes the `span_bug` case in `handle_tuple_field_pattern_match` to a
`delayed_span_bug`, because it now can be reached due to the removal
of the `stashed_err_count` call in `analysis`.
- Slightly changes the expected output of three tests. If no errors are
emitted but there are delayed bugs, the error count is no longer
printed. This is because delayed bugs are now always printed after the
error count is printed (or not printed, if the error count is zero).
There is a lot going on in this commit. It's hard to break into smaller
pieces because the existing code is very tangled. It took me a long time
and a lot of effort to understand how the different pieces interact, and
I think the new code is a lot simpler and easier to understand.
2024-02-19 10:00:19 +11:00
|
|
|
pub fn emit_stashed_diagnostics(&self) -> Option<ErrorGuaranteed> {
|
2022-01-22 18:49:12 -06:00
|
|
|
self.inner.borrow_mut().emit_stashed_diagnostics()
|
2017-08-10 09:17:03 +09:00
|
|
|
}
|
|
|
|
|
2024-02-19 09:36:08 +11:00
|
|
|
/// This excludes lint errors, delayed bugs and stashed errors.
|
2021-06-01 00:00:00 +00:00
|
|
|
#[inline]
|
2024-02-19 09:36:08 +11:00
|
|
|
pub fn err_count_excluding_lint_errs(&self) -> usize {
|
2024-02-09 16:12:18 +11:00
|
|
|
self.inner.borrow().err_guars.len()
|
2015-12-15 14:11:27 +13:00
|
|
|
}
|
|
|
|
|
2024-02-19 09:36:08 +11:00
|
|
|
/// This excludes delayed bugs and stashed errors.
|
|
|
|
#[inline]
|
|
|
|
pub fn err_count(&self) -> usize {
|
|
|
|
let inner = self.inner.borrow();
|
|
|
|
inner.err_guars.len() + inner.lint_err_guars.len()
|
|
|
|
}
|
|
|
|
|
|
|
|
/// This excludes normal errors, lint errors, and delayed bugs. Unless
|
Fix `ErrorGuaranteed` unsoundness with stash/steal.
When you stash an error, the error count is incremented. You can then
use the non-zero error count to get an `ErrorGuaranteed`. You can then
steal the error, which decrements the error count. You can then cancel
the error.
Example code:
```
fn unsound(dcx: &DiagCtxt) -> ErrorGuaranteed {
let sp = rustc_span::DUMMY_SP;
let k = rustc_errors::StashKey::Cycle;
dcx.struct_err("bogus").stash(sp, k); // increment error count on stash
let guar = dcx.has_errors().unwrap(); // ErrorGuaranteed from error count > 0
let err = dcx.steal_diagnostic(sp, k).unwrap(); // decrement error count on steal
err.cancel(); // cancel error
guar // ErrorGuaranteed with no error emitted!
}
```
This commit fixes the problem in the simplest way: by not counting
stashed errors in `DiagCtxt::{err_count,has_errors}`.
However, just doing this without any other changes leads to over 40 ui
test failures. Mostly because of uninteresting extra errors (many saying
"type annotations needed" when type inference fails), and in a few
cases, due to delayed bugs causing ICEs when no normal errors are
printed.
To fix these, this commit adds `DiagCtxt::stashed_err_count`, and uses
it in three places alongside `DiagCtxt::{has_errors,err_count}`. It's
dodgy to rely on it, because unlike `DiagCtxt::err_count` it can go up
and down. But it's needed to preserve existing behaviour, and at least
the three places that need it are now obvious.
2024-02-09 06:42:50 +11:00
|
|
|
/// absolutely necessary, avoid using this. It's dubious because stashed
|
|
|
|
/// errors can later be cancelled, so the presence of a stashed error at
|
|
|
|
/// some point of time doesn't guarantee anything -- there are no
|
|
|
|
/// `ErrorGuaranteed`s here.
|
|
|
|
pub fn stashed_err_count(&self) -> usize {
|
|
|
|
self.inner.borrow().stashed_err_count
|
|
|
|
}
|
|
|
|
|
2024-02-19 09:36:08 +11:00
|
|
|
/// This excludes lint errors, delayed bugs, and stashed errors. Unless
|
|
|
|
/// absolutely necessary, prefer `has_errors` to this method.
|
|
|
|
pub fn has_errors_excluding_lint_errors(&self) -> Option<ErrorGuaranteed> {
|
|
|
|
self.inner.borrow().has_errors_excluding_lint_errors()
|
2015-12-15 14:11:27 +13:00
|
|
|
}
|
2022-08-19 14:48:15 +01:00
|
|
|
|
2024-02-19 09:36:08 +11:00
|
|
|
/// This excludes delayed bugs and stashed errors.
|
|
|
|
pub fn has_errors(&self) -> Option<ErrorGuaranteed> {
|
|
|
|
self.inner.borrow().has_errors()
|
2022-11-24 11:12:34 +00:00
|
|
|
}
|
2023-12-04 14:06:28 +11:00
|
|
|
|
Fix `ErrorGuaranteed` unsoundness with stash/steal.
When you stash an error, the error count is incremented. You can then
use the non-zero error count to get an `ErrorGuaranteed`. You can then
steal the error, which decrements the error count. You can then cancel
the error.
Example code:
```
fn unsound(dcx: &DiagCtxt) -> ErrorGuaranteed {
let sp = rustc_span::DUMMY_SP;
let k = rustc_errors::StashKey::Cycle;
dcx.struct_err("bogus").stash(sp, k); // increment error count on stash
let guar = dcx.has_errors().unwrap(); // ErrorGuaranteed from error count > 0
let err = dcx.steal_diagnostic(sp, k).unwrap(); // decrement error count on steal
err.cancel(); // cancel error
guar // ErrorGuaranteed with no error emitted!
}
```
This commit fixes the problem in the simplest way: by not counting
stashed errors in `DiagCtxt::{err_count,has_errors}`.
However, just doing this without any other changes leads to over 40 ui
test failures. Mostly because of uninteresting extra errors (many saying
"type annotations needed" when type inference fails), and in a few
cases, due to delayed bugs causing ICEs when no normal errors are
printed.
To fix these, this commit adds `DiagCtxt::stashed_err_count`, and uses
it in three places alongside `DiagCtxt::{has_errors,err_count}`. It's
dodgy to rely on it, because unlike `DiagCtxt::err_count` it can go up
and down. But it's needed to preserve existing behaviour, and at least
the three places that need it are now obvious.
2024-02-09 06:42:50 +11:00
|
|
|
/// This excludes stashed errors. Unless absolutely necessary, prefer
|
2024-02-19 09:36:08 +11:00
|
|
|
/// `has_errors` to this method.
|
|
|
|
pub fn has_errors_or_delayed_bugs(&self) -> Option<ErrorGuaranteed> {
|
|
|
|
self.inner.borrow().has_errors_or_delayed_bugs()
|
2019-10-16 13:13:13 +02:00
|
|
|
}
|
2018-03-15 10:09:20 +01:00
|
|
|
|
2019-04-17 13:26:38 -04:00
|
|
|
pub fn print_error_count(&self, registry: &Registry) {
|
2023-12-04 14:06:28 +11:00
|
|
|
let mut inner = self.inner.borrow_mut();
|
|
|
|
|
Overhaul the handling of errors at the top-level.
Currently `emit_stashed_diagnostic` is called from four(!) different
places: `print_error_count`, `DiagCtxtInner::drop`, `abort_if_errors`,
and `compile_status`.
And `flush_delayed` is called from two different places:
`DiagCtxtInner::drop` and `Queries`.
This is pretty gross! Each one should really be called from a single
place, but there's a bunch of entanglements. This commit cleans up this
mess.
Specifically, it:
- Removes all the existing calls to `emit_stashed_diagnostic`, and adds
a single new call in `finish_diagnostics`.
- Removes the early `flush_delayed` call in `codegen_and_build_linker`,
replacing it with a simple early return if delayed bugs are present.
- Changes `DiagCtxtInner::drop` and `DiagCtxtInner::flush_delayed` so
they both assert that the stashed diagnostics are empty (i.e.
processed beforehand).
- Changes `interface::run_compiler` so that any errors emitted during
`finish_diagnostics` (i.e. late-emitted stashed diagnostics) are
counted and cannot be overlooked. This requires adding
`ErrorGuaranteed` return values to several functions.
- Removes the `stashed_err_count` call in `analysis`. This is possible
now that we don't have to worry about calling `flush_delayed` early
from `codegen_and_build_linker` when stashed diagnostics are pending.
- Changes the `span_bug` case in `handle_tuple_field_pattern_match` to a
`delayed_span_bug`, because it now can be reached due to the removal
of the `stashed_err_count` call in `analysis`.
- Slightly changes the expected output of three tests. If no errors are
emitted but there are delayed bugs, the error count is no longer
printed. This is because delayed bugs are now always printed after the
error count is printed (or not printed, if the error count is zero).
There is a lot going on in this commit. It's hard to break into smaller
pieces because the existing code is very tangled. It took me a long time
and a lot of effort to understand how the different pieces interact, and
I think the new code is a lot simpler and easier to understand.
2024-02-19 10:00:19 +11:00
|
|
|
// Any stashed diagnostics should have been handled by
|
|
|
|
// `emit_stashed_diagnostics` by now.
|
|
|
|
assert!(inner.stashed_diagnostics.is_empty());
|
2023-12-04 14:06:28 +11:00
|
|
|
|
2024-01-10 14:45:38 +11:00
|
|
|
if inner.treat_err_as_bug() {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2023-12-04 14:06:28 +11:00
|
|
|
let warnings = match inner.deduplicated_warn_count {
|
|
|
|
0 => Cow::from(""),
|
|
|
|
1 => Cow::from("1 warning emitted"),
|
|
|
|
count => Cow::from(format!("{count} warnings emitted")),
|
|
|
|
};
|
|
|
|
let errors = match inner.deduplicated_err_count {
|
|
|
|
0 => Cow::from(""),
|
|
|
|
1 => Cow::from("aborting due to 1 previous error"),
|
|
|
|
count => Cow::from(format!("aborting due to {count} previous errors")),
|
|
|
|
};
|
|
|
|
|
|
|
|
match (errors.len(), warnings.len()) {
|
|
|
|
(0, 0) => return,
|
2024-02-02 15:44:22 +11:00
|
|
|
(0, _) => {
|
2024-02-13 08:19:55 +11:00
|
|
|
// Use `ForceWarning` rather than `Warning` to guarantee emission, e.g. with a
|
|
|
|
// configuration like `--cap-lints allow --force-warn bare_trait_objects`.
|
|
|
|
inner.emit_diagnostic(Diagnostic::new(
|
|
|
|
ForceWarning(None),
|
|
|
|
DiagnosticMessage::Str(warnings),
|
|
|
|
));
|
2024-02-02 15:44:22 +11:00
|
|
|
}
|
2023-12-04 14:06:28 +11:00
|
|
|
(_, 0) => {
|
2024-02-12 16:34:39 +11:00
|
|
|
inner.emit_diagnostic(Diagnostic::new(Error, errors));
|
2023-12-04 14:06:28 +11:00
|
|
|
}
|
|
|
|
(_, _) => {
|
2024-02-12 16:34:39 +11:00
|
|
|
inner.emit_diagnostic(Diagnostic::new(Error, format!("{errors}; {warnings}")));
|
2023-12-04 14:06:28 +11:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
let can_show_explain = inner.emitter.should_show_explain();
|
|
|
|
let are_there_diagnostics = !inner.emitted_diagnostic_codes.is_empty();
|
|
|
|
if can_show_explain && are_there_diagnostics {
|
|
|
|
let mut error_codes = inner
|
|
|
|
.emitted_diagnostic_codes
|
|
|
|
.iter()
|
Stop using `String` for error codes.
Error codes are integers, but `String` is used everywhere to represent
them. Gross!
This commit introduces `ErrCode`, an integral newtype for error codes,
replacing `String`. It also introduces a constant for every error code,
e.g. `E0123`, and removes the `error_code!` macro. The constants are
imported wherever used with `use rustc_errors::codes::*`.
With the old code, we have three different ways to specify an error code
at a use point:
```
error_code!(E0123) // macro call
struct_span_code_err!(dcx, span, E0123, "msg"); // bare ident arg to macro call
\#[diag(name, code = "E0123")] // string
struct Diag;
```
With the new code, they all use the `E0123` constant.
```
E0123 // constant
struct_span_code_err!(dcx, span, E0123, "msg"); // constant
\#[diag(name, code = E0123)] // constant
struct Diag;
```
The commit also changes the structure of the error code definitions:
- `rustc_error_codes` now just defines a higher-order macro listing the
used error codes and nothing else.
- Because that's now the only thing in the `rustc_error_codes` crate, I
moved it into the `lib.rs` file and removed the `error_codes.rs` file.
- `rustc_errors` uses that macro to define everything, e.g. the error
code constants and the `DIAGNOSTIC_TABLES`. This is in its new
`codes.rs` file.
2024-01-14 10:57:07 +11:00
|
|
|
.filter_map(|&code| {
|
2024-02-23 19:56:35 +01:00
|
|
|
if registry.try_find_description(code).is_ok() {
|
Stop using `String` for error codes.
Error codes are integers, but `String` is used everywhere to represent
them. Gross!
This commit introduces `ErrCode`, an integral newtype for error codes,
replacing `String`. It also introduces a constant for every error code,
e.g. `E0123`, and removes the `error_code!` macro. The constants are
imported wherever used with `use rustc_errors::codes::*`.
With the old code, we have three different ways to specify an error code
at a use point:
```
error_code!(E0123) // macro call
struct_span_code_err!(dcx, span, E0123, "msg"); // bare ident arg to macro call
\#[diag(name, code = "E0123")] // string
struct Diag;
```
With the new code, they all use the `E0123` constant.
```
E0123 // constant
struct_span_code_err!(dcx, span, E0123, "msg"); // constant
\#[diag(name, code = E0123)] // constant
struct Diag;
```
The commit also changes the structure of the error code definitions:
- `rustc_error_codes` now just defines a higher-order macro listing the
used error codes and nothing else.
- Because that's now the only thing in the `rustc_error_codes` crate, I
moved it into the `lib.rs` file and removed the `error_codes.rs` file.
- `rustc_errors` uses that macro to define everything, e.g. the error
code constants and the `DIAGNOSTIC_TABLES`. This is in its new
`codes.rs` file.
2024-01-14 10:57:07 +11:00
|
|
|
Some(code.to_string())
|
2024-01-13 13:11:56 +11:00
|
|
|
} else {
|
|
|
|
None
|
2023-12-04 14:06:28 +11:00
|
|
|
}
|
|
|
|
})
|
|
|
|
.collect::<Vec<_>>();
|
|
|
|
if !error_codes.is_empty() {
|
|
|
|
error_codes.sort();
|
|
|
|
if error_codes.len() > 1 {
|
|
|
|
let limit = if error_codes.len() > 9 { 9 } else { error_codes.len() };
|
2024-02-13 08:19:55 +11:00
|
|
|
let msg1 = format!(
|
2023-12-04 14:06:28 +11:00
|
|
|
"Some errors have detailed explanations: {}{}",
|
|
|
|
error_codes[..limit].join(", "),
|
|
|
|
if error_codes.len() > 9 { "..." } else { "." }
|
2024-02-13 08:19:55 +11:00
|
|
|
);
|
|
|
|
let msg2 = format!(
|
2023-12-20 10:55:18 +11:00
|
|
|
"For more information about an error, try `rustc --explain {}`.",
|
2023-12-04 14:06:28 +11:00
|
|
|
&error_codes[0]
|
2024-02-13 08:19:55 +11:00
|
|
|
);
|
|
|
|
inner.emit_diagnostic(Diagnostic::new(FailureNote, msg1));
|
|
|
|
inner.emit_diagnostic(Diagnostic::new(FailureNote, msg2));
|
2023-12-04 14:06:28 +11:00
|
|
|
} else {
|
2024-02-13 08:19:55 +11:00
|
|
|
let msg = format!(
|
2023-12-20 10:55:18 +11:00
|
|
|
"For more information about this error, try `rustc --explain {}`.",
|
2023-12-04 14:06:28 +11:00
|
|
|
&error_codes[0]
|
2024-02-13 08:19:55 +11:00
|
|
|
);
|
|
|
|
inner.emit_diagnostic(Diagnostic::new(FailureNote, msg));
|
2023-12-04 14:06:28 +11:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2019-09-07 12:09:52 -04:00
|
|
|
}
|
|
|
|
|
2024-02-19 10:23:58 +11:00
|
|
|
/// This excludes delayed bugs and stashed errors. Used for early aborts
|
|
|
|
/// after errors occurred -- e.g. because continuing in the face of errors is
|
|
|
|
/// likely to lead to bad results, such as spurious/uninteresting
|
|
|
|
/// additional errors -- when returning an error `Result` is difficult.
|
2019-09-07 12:09:52 -04:00
|
|
|
pub fn abort_if_errors(&self) {
|
Overhaul the handling of errors at the top-level.
Currently `emit_stashed_diagnostic` is called from four(!) different
places: `print_error_count`, `DiagCtxtInner::drop`, `abort_if_errors`,
and `compile_status`.
And `flush_delayed` is called from two different places:
`DiagCtxtInner::drop` and `Queries`.
This is pretty gross! Each one should really be called from a single
place, but there's a bunch of entanglements. This commit cleans up this
mess.
Specifically, it:
- Removes all the existing calls to `emit_stashed_diagnostic`, and adds
a single new call in `finish_diagnostics`.
- Removes the early `flush_delayed` call in `codegen_and_build_linker`,
replacing it with a simple early return if delayed bugs are present.
- Changes `DiagCtxtInner::drop` and `DiagCtxtInner::flush_delayed` so
they both assert that the stashed diagnostics are empty (i.e.
processed beforehand).
- Changes `interface::run_compiler` so that any errors emitted during
`finish_diagnostics` (i.e. late-emitted stashed diagnostics) are
counted and cannot be overlooked. This requires adding
`ErrorGuaranteed` return values to several functions.
- Removes the `stashed_err_count` call in `analysis`. This is possible
now that we don't have to worry about calling `flush_delayed` early
from `codegen_and_build_linker` when stashed diagnostics are pending.
- Changes the `span_bug` case in `handle_tuple_field_pattern_match` to a
`delayed_span_bug`, because it now can be reached due to the removal
of the `stashed_err_count` call in `analysis`.
- Slightly changes the expected output of three tests. If no errors are
emitted but there are delayed bugs, the error count is no longer
printed. This is because delayed bugs are now always printed after the
error count is printed (or not printed, if the error count is zero).
There is a lot going on in this commit. It's hard to break into smaller
pieces because the existing code is very tangled. It took me a long time
and a lot of effort to understand how the different pieces interact, and
I think the new code is a lot simpler and easier to understand.
2024-02-19 10:00:19 +11:00
|
|
|
if self.has_errors().is_some() {
|
2023-12-04 14:06:28 +11:00
|
|
|
FatalError.raise();
|
|
|
|
}
|
2019-09-07 12:09:52 -04:00
|
|
|
}
|
|
|
|
|
2019-09-23 19:29:02 +02:00
|
|
|
/// `true` if we haven't taught a diagnostic with this code already.
|
|
|
|
/// The caller must then teach the user about such a diagnostic.
|
|
|
|
///
|
|
|
|
/// Used to suppress emitting the same error multiple times with extended explanation when
|
|
|
|
/// calling `-Zteach`.
|
Stop using `String` for error codes.
Error codes are integers, but `String` is used everywhere to represent
them. Gross!
This commit introduces `ErrCode`, an integral newtype for error codes,
replacing `String`. It also introduces a constant for every error code,
e.g. `E0123`, and removes the `error_code!` macro. The constants are
imported wherever used with `use rustc_errors::codes::*`.
With the old code, we have three different ways to specify an error code
at a use point:
```
error_code!(E0123) // macro call
struct_span_code_err!(dcx, span, E0123, "msg"); // bare ident arg to macro call
\#[diag(name, code = "E0123")] // string
struct Diag;
```
With the new code, they all use the `E0123` constant.
```
E0123 // constant
struct_span_code_err!(dcx, span, E0123, "msg"); // constant
\#[diag(name, code = E0123)] // constant
struct Diag;
```
The commit also changes the structure of the error code definitions:
- `rustc_error_codes` now just defines a higher-order macro listing the
used error codes and nothing else.
- Because that's now the only thing in the `rustc_error_codes` crate, I
moved it into the `lib.rs` file and removed the `error_codes.rs` file.
- `rustc_errors` uses that macro to define everything, e.g. the error
code constants and the `DIAGNOSTIC_TABLES`. This is in its new
`codes.rs` file.
2024-01-14 10:57:07 +11:00
|
|
|
pub fn must_teach(&self, code: ErrCode) -> bool {
|
|
|
|
self.inner.borrow_mut().taught_diagnostics.insert(code)
|
2019-09-07 12:09:52 -04:00
|
|
|
}
|
|
|
|
|
2024-01-08 08:27:38 +11:00
|
|
|
pub fn emit_diagnostic(&self, diagnostic: Diagnostic) -> Option<ErrorGuaranteed> {
|
|
|
|
self.inner.borrow_mut().emit_diagnostic(diagnostic)
|
2019-09-07 12:09:52 -04:00
|
|
|
}
|
|
|
|
|
2024-02-08 16:02:20 +11:00
|
|
|
pub fn emit_artifact_notification(&self, path: &Path, artifact_type: &str) {
|
|
|
|
self.inner.borrow_mut().emitter.emit_artifact_notification(path, artifact_type);
|
2022-09-18 11:45:41 -04:00
|
|
|
}
|
|
|
|
|
2024-02-08 16:02:20 +11:00
|
|
|
pub fn emit_future_breakage_report(&self) {
|
|
|
|
let mut inner = self.inner.borrow_mut();
|
|
|
|
let diags = std::mem::take(&mut inner.future_breakage_diagnostics);
|
|
|
|
if !diags.is_empty() {
|
|
|
|
inner.emitter.emit_future_breakage_report(diags);
|
|
|
|
}
|
2022-09-18 11:45:41 -04:00
|
|
|
}
|
|
|
|
|
2024-02-08 16:02:20 +11:00
|
|
|
pub fn emit_unused_externs(
|
|
|
|
&self,
|
|
|
|
lint_level: rustc_lint_defs::Level,
|
|
|
|
loud: bool,
|
|
|
|
unused_externs: &[&str],
|
|
|
|
) {
|
|
|
|
let mut inner = self.inner.borrow_mut();
|
2022-09-18 11:45:41 -04:00
|
|
|
|
2024-02-12 18:04:07 +01:00
|
|
|
// This "error" is an odd duck.
|
|
|
|
// - It's only produce with JSON output.
|
|
|
|
// - It's not emitted the usual way, via `emit_diagnostic`.
|
|
|
|
// - The `$message_type` field is "unused_externs" rather than the usual
|
|
|
|
// "diagnosic".
|
|
|
|
//
|
|
|
|
// We count it as a lint error because it has a lint level. The value
|
|
|
|
// of `loud` (which comes from "unused-externs" or
|
|
|
|
// "unused-externs-silent"), also affects whether it's treated like a
|
|
|
|
// hard error or not.
|
2024-02-08 16:02:20 +11:00
|
|
|
if loud && lint_level.is_error() {
|
2024-02-12 18:04:07 +01:00
|
|
|
// This `unchecked_error_guaranteed` is valid. It is where the
|
|
|
|
// `ErrorGuaranteed` for unused_extern errors originates.
|
|
|
|
#[allow(deprecated)]
|
|
|
|
inner.lint_err_guars.push(ErrorGuaranteed::unchecked_error_guaranteed());
|
2024-02-08 16:02:20 +11:00
|
|
|
inner.panic_if_treat_err_as_bug();
|
|
|
|
}
|
2022-09-18 11:45:41 -04:00
|
|
|
|
2024-02-08 16:02:20 +11:00
|
|
|
inner.emitter.emit_unused_externs(lint_level, unused_externs)
|
2022-08-19 14:48:15 +01:00
|
|
|
}
|
|
|
|
|
2024-02-08 16:02:20 +11:00
|
|
|
pub fn update_unstable_expectation_id(
|
|
|
|
&self,
|
|
|
|
unstable_to_stable: &FxIndexMap<LintExpectationId, LintExpectationId>,
|
|
|
|
) {
|
|
|
|
let mut inner = self.inner.borrow_mut();
|
|
|
|
let diags = std::mem::take(&mut inner.unstable_expect_diagnostics);
|
|
|
|
inner.check_unstable_expect_diagnostics = true;
|
|
|
|
|
|
|
|
if !diags.is_empty() {
|
|
|
|
inner.suppressed_expected_diag = true;
|
|
|
|
for mut diag in diags.into_iter() {
|
|
|
|
diag.update_unstable_expectation_id(unstable_to_stable);
|
|
|
|
|
|
|
|
// Here the diagnostic is given back to `emit_diagnostic` where it was first
|
|
|
|
// intercepted. Now it should be processed as usual, since the unstable expectation
|
|
|
|
// id is now stable.
|
|
|
|
inner.emit_diagnostic(diag);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
inner
|
|
|
|
.stashed_diagnostics
|
|
|
|
.values_mut()
|
|
|
|
.for_each(|diag| diag.update_unstable_expectation_id(unstable_to_stable));
|
|
|
|
inner
|
|
|
|
.future_breakage_diagnostics
|
|
|
|
.iter_mut()
|
|
|
|
.for_each(|diag| diag.update_unstable_expectation_id(unstable_to_stable));
|
|
|
|
}
|
|
|
|
|
|
|
|
/// This methods steals all [`LintExpectationId`]s that are stored inside
|
|
|
|
/// [`DiagCtxtInner`] and indicate that the linked expectation has been fulfilled.
|
|
|
|
#[must_use]
|
|
|
|
pub fn steal_fulfilled_expectation_ids(&self) -> FxHashSet<LintExpectationId> {
|
|
|
|
assert!(
|
|
|
|
self.inner.borrow().unstable_expect_diagnostics.is_empty(),
|
|
|
|
"`DiagCtxtInner::unstable_expect_diagnostics` should be empty at this point",
|
|
|
|
);
|
|
|
|
std::mem::take(&mut self.inner.borrow_mut().fulfilled_expectations)
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn flush_delayed(&self) {
|
2024-02-12 16:48:45 +11:00
|
|
|
self.inner.borrow_mut().flush_delayed();
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Used when trimmed_def_paths is called and we must produce a diagnostic
|
|
|
|
/// to justify its cost.
|
|
|
|
pub fn set_must_produce_diag(&self) {
|
|
|
|
self.inner.borrow_mut().must_produce_diag = true;
|
2024-02-08 16:02:20 +11:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// This `impl` block contains only the public diagnostic creation/emission API.
|
|
|
|
//
|
|
|
|
// Functions beginning with `struct_`/`create_` create a diagnostic. Other
|
|
|
|
// functions create and emit a diagnostic all in one go.
|
|
|
|
impl DiagCtxt {
|
2024-02-08 16:09:30 +11:00
|
|
|
// No `#[rustc_lint_diagnostics]` because bug messages aren't user-facing.
|
2024-02-08 16:02:20 +11:00
|
|
|
#[track_caller]
|
|
|
|
pub fn struct_bug(&self, msg: impl Into<DiagnosticMessage>) -> DiagnosticBuilder<'_, BugAbort> {
|
|
|
|
DiagnosticBuilder::new(self, Bug, msg)
|
|
|
|
}
|
|
|
|
|
2024-02-08 16:09:30 +11:00
|
|
|
// No `#[rustc_lint_diagnostics]` because bug messages aren't user-facing.
|
|
|
|
#[track_caller]
|
2024-02-08 16:02:20 +11:00
|
|
|
pub fn bug(&self, msg: impl Into<DiagnosticMessage>) -> ! {
|
|
|
|
self.struct_bug(msg).emit()
|
|
|
|
}
|
|
|
|
|
2024-02-08 16:09:30 +11:00
|
|
|
// No `#[rustc_lint_diagnostics]` because bug messages aren't user-facing.
|
2024-02-08 16:02:20 +11:00
|
|
|
#[track_caller]
|
|
|
|
pub fn struct_span_bug(
|
|
|
|
&self,
|
|
|
|
span: impl Into<MultiSpan>,
|
|
|
|
msg: impl Into<DiagnosticMessage>,
|
|
|
|
) -> DiagnosticBuilder<'_, BugAbort> {
|
|
|
|
self.struct_bug(msg).with_span(span)
|
|
|
|
}
|
|
|
|
|
2024-02-08 16:09:30 +11:00
|
|
|
// No `#[rustc_lint_diagnostics]` because bug messages aren't user-facing.
|
|
|
|
#[track_caller]
|
2024-02-08 16:02:20 +11:00
|
|
|
pub fn span_bug(&self, span: impl Into<MultiSpan>, msg: impl Into<DiagnosticMessage>) -> ! {
|
|
|
|
self.struct_span_bug(span, msg).emit()
|
|
|
|
}
|
|
|
|
|
|
|
|
#[track_caller]
|
|
|
|
pub fn create_bug<'a>(
|
2022-08-19 14:48:15 +01:00
|
|
|
&'a self,
|
2024-02-08 16:02:20 +11:00
|
|
|
bug: impl IntoDiagnostic<'a, BugAbort>,
|
|
|
|
) -> DiagnosticBuilder<'a, BugAbort> {
|
|
|
|
bug.into_diagnostic(self, Bug)
|
|
|
|
}
|
|
|
|
|
|
|
|
#[track_caller]
|
2024-02-08 16:09:30 +11:00
|
|
|
pub fn emit_bug<'a>(&'a self, bug: impl IntoDiagnostic<'a, BugAbort>) -> ! {
|
2024-02-08 16:02:20 +11:00
|
|
|
self.create_bug(bug).emit()
|
|
|
|
}
|
|
|
|
|
|
|
|
#[rustc_lint_diagnostics]
|
|
|
|
#[track_caller]
|
|
|
|
pub fn struct_fatal(
|
|
|
|
&self,
|
|
|
|
msg: impl Into<DiagnosticMessage>,
|
|
|
|
) -> DiagnosticBuilder<'_, FatalAbort> {
|
|
|
|
DiagnosticBuilder::new(self, Fatal, msg)
|
|
|
|
}
|
|
|
|
|
|
|
|
#[rustc_lint_diagnostics]
|
2024-02-08 16:09:30 +11:00
|
|
|
#[track_caller]
|
2024-02-08 16:02:20 +11:00
|
|
|
pub fn fatal(&self, msg: impl Into<DiagnosticMessage>) -> ! {
|
|
|
|
self.struct_fatal(msg).emit()
|
|
|
|
}
|
|
|
|
|
|
|
|
#[rustc_lint_diagnostics]
|
|
|
|
#[track_caller]
|
|
|
|
pub fn struct_span_fatal(
|
|
|
|
&self,
|
|
|
|
span: impl Into<MultiSpan>,
|
|
|
|
msg: impl Into<DiagnosticMessage>,
|
|
|
|
) -> DiagnosticBuilder<'_, FatalAbort> {
|
|
|
|
self.struct_fatal(msg).with_span(span)
|
|
|
|
}
|
|
|
|
|
|
|
|
#[rustc_lint_diagnostics]
|
|
|
|
#[track_caller]
|
|
|
|
pub fn span_fatal(&self, span: impl Into<MultiSpan>, msg: impl Into<DiagnosticMessage>) -> ! {
|
|
|
|
self.struct_span_fatal(span, msg).emit()
|
2022-08-19 14:48:15 +01:00
|
|
|
}
|
|
|
|
|
2023-12-18 21:14:02 +11:00
|
|
|
#[track_caller]
|
2022-09-18 11:45:41 -04:00
|
|
|
pub fn create_fatal<'a>(
|
|
|
|
&'a self,
|
2023-12-18 16:31:15 +11:00
|
|
|
fatal: impl IntoDiagnostic<'a, FatalAbort>,
|
|
|
|
) -> DiagnosticBuilder<'a, FatalAbort> {
|
2023-12-21 15:57:03 +11:00
|
|
|
fatal.into_diagnostic(self, Fatal)
|
2022-09-18 11:45:41 -04:00
|
|
|
}
|
|
|
|
|
2023-12-18 21:14:02 +11:00
|
|
|
#[track_caller]
|
2023-12-18 16:31:15 +11:00
|
|
|
pub fn emit_fatal<'a>(&'a self, fatal: impl IntoDiagnostic<'a, FatalAbort>) -> ! {
|
2022-09-18 11:45:41 -04:00
|
|
|
self.create_fatal(fatal).emit()
|
|
|
|
}
|
|
|
|
|
2023-12-18 21:14:02 +11:00
|
|
|
#[track_caller]
|
2024-02-08 16:02:20 +11:00
|
|
|
pub fn create_almost_fatal<'a>(
|
2022-11-23 01:07:36 -05:00
|
|
|
&'a self,
|
2024-02-08 16:02:20 +11:00
|
|
|
fatal: impl IntoDiagnostic<'a, FatalError>,
|
|
|
|
) -> DiagnosticBuilder<'a, FatalError> {
|
|
|
|
fatal.into_diagnostic(self, Fatal)
|
2022-11-23 01:07:36 -05:00
|
|
|
}
|
|
|
|
|
2023-12-18 21:14:02 +11:00
|
|
|
#[track_caller]
|
2024-02-08 16:02:20 +11:00
|
|
|
pub fn emit_almost_fatal<'a>(
|
|
|
|
&'a self,
|
|
|
|
fatal: impl IntoDiagnostic<'a, FatalError>,
|
|
|
|
) -> FatalError {
|
|
|
|
self.create_almost_fatal(fatal).emit()
|
2022-11-23 01:07:36 -05:00
|
|
|
}
|
|
|
|
|
2024-02-08 16:02:20 +11:00
|
|
|
// FIXME: This method should be removed (every error should have an associated error code).
|
|
|
|
#[rustc_lint_diagnostics]
|
2023-12-18 21:14:02 +11:00
|
|
|
#[track_caller]
|
2024-02-08 16:02:20 +11:00
|
|
|
pub fn struct_err(&self, msg: impl Into<DiagnosticMessage>) -> DiagnosticBuilder<'_> {
|
|
|
|
DiagnosticBuilder::new(self, Error, msg)
|
|
|
|
}
|
|
|
|
|
|
|
|
#[rustc_lint_diagnostics]
|
2024-02-08 16:09:30 +11:00
|
|
|
#[track_caller]
|
2024-02-08 16:02:20 +11:00
|
|
|
pub fn err(&self, msg: impl Into<DiagnosticMessage>) -> ErrorGuaranteed {
|
|
|
|
self.struct_err(msg).emit()
|
2022-10-14 14:00:06 +01:00
|
|
|
}
|
|
|
|
|
2024-02-08 16:02:20 +11:00
|
|
|
#[rustc_lint_diagnostics]
|
2023-12-18 21:14:02 +11:00
|
|
|
#[track_caller]
|
2024-02-08 16:02:20 +11:00
|
|
|
pub fn struct_span_err(
|
|
|
|
&self,
|
|
|
|
span: impl Into<MultiSpan>,
|
|
|
|
msg: impl Into<DiagnosticMessage>,
|
|
|
|
) -> DiagnosticBuilder<'_> {
|
|
|
|
self.struct_err(msg).with_span(span)
|
2022-10-14 14:00:06 +01:00
|
|
|
}
|
|
|
|
|
2024-02-08 16:02:20 +11:00
|
|
|
#[rustc_lint_diagnostics]
|
|
|
|
#[track_caller]
|
|
|
|
pub fn span_err(
|
|
|
|
&self,
|
|
|
|
span: impl Into<MultiSpan>,
|
|
|
|
msg: impl Into<DiagnosticMessage>,
|
|
|
|
) -> ErrorGuaranteed {
|
|
|
|
self.struct_span_err(span, msg).emit()
|
2019-09-07 12:09:52 -04:00
|
|
|
}
|
|
|
|
|
2024-02-08 16:02:20 +11:00
|
|
|
#[track_caller]
|
|
|
|
pub fn create_err<'a>(&'a self, err: impl IntoDiagnostic<'a>) -> DiagnosticBuilder<'a> {
|
|
|
|
err.into_diagnostic(self, Error)
|
2020-08-13 15:41:52 -04:00
|
|
|
}
|
|
|
|
|
2024-02-08 16:02:20 +11:00
|
|
|
#[track_caller]
|
|
|
|
pub fn emit_err<'a>(&'a self, err: impl IntoDiagnostic<'a>) -> ErrorGuaranteed {
|
|
|
|
self.create_err(err).emit()
|
|
|
|
}
|
|
|
|
|
2024-02-08 16:09:30 +11:00
|
|
|
/// Ensures that an error is printed. See `Level::DelayedBug`.
|
|
|
|
// No `#[rustc_lint_diagnostics]` because bug messages aren't user-facing.
|
2024-02-08 16:02:20 +11:00
|
|
|
#[track_caller]
|
|
|
|
pub fn delayed_bug(&self, msg: impl Into<DiagnosticMessage>) -> ErrorGuaranteed {
|
|
|
|
DiagnosticBuilder::<ErrorGuaranteed>::new(self, DelayedBug, msg).emit()
|
|
|
|
}
|
|
|
|
|
2024-02-08 16:09:30 +11:00
|
|
|
/// Ensures that an error is printed. See `Level::DelayedBug`.
|
2024-02-08 16:02:20 +11:00
|
|
|
///
|
|
|
|
/// Note: this function used to be called `delay_span_bug`. It was renamed
|
|
|
|
/// to match similar functions like `span_err`, `span_warn`, etc.
|
2024-02-08 16:09:30 +11:00
|
|
|
// No `#[rustc_lint_diagnostics]` because bug messages aren't user-facing.
|
2024-02-08 16:02:20 +11:00
|
|
|
#[track_caller]
|
|
|
|
pub fn span_delayed_bug(
|
2022-04-16 17:11:33 -07:00
|
|
|
&self,
|
2024-02-08 16:02:20 +11:00
|
|
|
sp: impl Into<MultiSpan>,
|
|
|
|
msg: impl Into<DiagnosticMessage>,
|
|
|
|
) -> ErrorGuaranteed {
|
|
|
|
DiagnosticBuilder::<ErrorGuaranteed>::new(self, DelayedBug, msg).with_span(sp).emit()
|
|
|
|
}
|
2022-04-15 00:37:40 -07:00
|
|
|
|
2024-02-08 16:02:20 +11:00
|
|
|
#[rustc_lint_diagnostics]
|
|
|
|
#[track_caller]
|
|
|
|
pub fn struct_warn(&self, msg: impl Into<DiagnosticMessage>) -> DiagnosticBuilder<'_, ()> {
|
|
|
|
DiagnosticBuilder::new(self, Warning, msg)
|
2020-06-30 18:58:15 +02:00
|
|
|
}
|
2021-08-06 23:28:58 +02:00
|
|
|
|
2024-02-08 16:02:20 +11:00
|
|
|
#[rustc_lint_diagnostics]
|
2024-02-08 16:09:30 +11:00
|
|
|
#[track_caller]
|
2024-02-08 16:02:20 +11:00
|
|
|
pub fn warn(&self, msg: impl Into<DiagnosticMessage>) {
|
|
|
|
self.struct_warn(msg).emit()
|
|
|
|
}
|
|
|
|
|
|
|
|
#[rustc_lint_diagnostics]
|
|
|
|
#[track_caller]
|
|
|
|
pub fn struct_span_warn(
|
2021-11-20 20:45:27 +01:00
|
|
|
&self,
|
2024-02-08 16:02:20 +11:00
|
|
|
span: impl Into<MultiSpan>,
|
|
|
|
msg: impl Into<DiagnosticMessage>,
|
|
|
|
) -> DiagnosticBuilder<'_, ()> {
|
|
|
|
self.struct_warn(msg).with_span(span)
|
|
|
|
}
|
2021-11-20 20:45:27 +01:00
|
|
|
|
2024-02-08 16:02:20 +11:00
|
|
|
#[rustc_lint_diagnostics]
|
|
|
|
#[track_caller]
|
|
|
|
pub fn span_warn(&self, span: impl Into<MultiSpan>, msg: impl Into<DiagnosticMessage>) {
|
|
|
|
self.struct_span_warn(span, msg).emit()
|
|
|
|
}
|
2022-03-05 21:54:49 +01:00
|
|
|
|
2024-02-08 16:02:20 +11:00
|
|
|
#[track_caller]
|
|
|
|
pub fn create_warn<'a>(
|
|
|
|
&'a self,
|
|
|
|
warning: impl IntoDiagnostic<'a, ()>,
|
|
|
|
) -> DiagnosticBuilder<'a, ()> {
|
|
|
|
warning.into_diagnostic(self, Warning)
|
|
|
|
}
|
2022-03-05 21:54:49 +01:00
|
|
|
|
2024-02-08 16:02:20 +11:00
|
|
|
#[track_caller]
|
|
|
|
pub fn emit_warn<'a>(&'a self, warning: impl IntoDiagnostic<'a, ()>) {
|
|
|
|
self.create_warn(warning).emit()
|
2021-11-20 20:45:27 +01:00
|
|
|
}
|
|
|
|
|
2024-02-08 16:02:20 +11:00
|
|
|
#[rustc_lint_diagnostics]
|
|
|
|
#[track_caller]
|
|
|
|
pub fn struct_note(&self, msg: impl Into<DiagnosticMessage>) -> DiagnosticBuilder<'_, ()> {
|
|
|
|
DiagnosticBuilder::new(self, Note, msg)
|
2021-08-06 23:28:58 +02:00
|
|
|
}
|
2022-09-27 20:56:05 +02:00
|
|
|
|
2024-02-08 16:02:20 +11:00
|
|
|
#[rustc_lint_diagnostics]
|
2024-02-08 16:09:30 +11:00
|
|
|
#[track_caller]
|
2024-02-08 16:02:20 +11:00
|
|
|
pub fn note(&self, msg: impl Into<DiagnosticMessage>) {
|
|
|
|
self.struct_note(msg).emit()
|
|
|
|
}
|
|
|
|
|
|
|
|
#[rustc_lint_diagnostics]
|
2024-02-08 16:09:30 +11:00
|
|
|
#[track_caller]
|
2024-02-08 16:02:20 +11:00
|
|
|
pub fn struct_span_note(
|
|
|
|
&self,
|
|
|
|
span: impl Into<MultiSpan>,
|
|
|
|
msg: impl Into<DiagnosticMessage>,
|
|
|
|
) -> DiagnosticBuilder<'_, ()> {
|
2024-02-13 09:13:52 +11:00
|
|
|
self.struct_note(msg).with_span(span)
|
2024-02-08 16:02:20 +11:00
|
|
|
}
|
|
|
|
|
|
|
|
#[rustc_lint_diagnostics]
|
2024-02-08 16:09:30 +11:00
|
|
|
#[track_caller]
|
2024-02-08 16:02:20 +11:00
|
|
|
pub fn span_note(&self, span: impl Into<MultiSpan>, msg: impl Into<DiagnosticMessage>) {
|
|
|
|
self.struct_span_note(span, msg).emit()
|
|
|
|
}
|
|
|
|
|
|
|
|
#[track_caller]
|
|
|
|
pub fn create_note<'a>(
|
|
|
|
&'a self,
|
|
|
|
note: impl IntoDiagnostic<'a, ()>,
|
|
|
|
) -> DiagnosticBuilder<'a, ()> {
|
|
|
|
note.into_diagnostic(self, Note)
|
|
|
|
}
|
|
|
|
|
|
|
|
#[track_caller]
|
|
|
|
pub fn emit_note<'a>(&'a self, note: impl IntoDiagnostic<'a, ()>) {
|
|
|
|
self.create_note(note).emit()
|
|
|
|
}
|
|
|
|
|
|
|
|
#[rustc_lint_diagnostics]
|
2024-02-08 16:09:30 +11:00
|
|
|
#[track_caller]
|
2024-02-08 16:02:20 +11:00
|
|
|
pub fn struct_help(&self, msg: impl Into<DiagnosticMessage>) -> DiagnosticBuilder<'_, ()> {
|
|
|
|
DiagnosticBuilder::new(self, Help, msg)
|
|
|
|
}
|
|
|
|
|
2024-02-13 08:19:55 +11:00
|
|
|
#[rustc_lint_diagnostics]
|
|
|
|
#[track_caller]
|
|
|
|
pub fn struct_failure_note(
|
|
|
|
&self,
|
|
|
|
msg: impl Into<DiagnosticMessage>,
|
|
|
|
) -> DiagnosticBuilder<'_, ()> {
|
|
|
|
DiagnosticBuilder::new(self, FailureNote, msg)
|
|
|
|
}
|
|
|
|
|
2024-02-08 16:02:20 +11:00
|
|
|
#[rustc_lint_diagnostics]
|
|
|
|
#[track_caller]
|
|
|
|
pub fn struct_allow(&self, msg: impl Into<DiagnosticMessage>) -> DiagnosticBuilder<'_, ()> {
|
|
|
|
DiagnosticBuilder::new(self, Allow, msg)
|
|
|
|
}
|
|
|
|
|
|
|
|
#[rustc_lint_diagnostics]
|
|
|
|
#[track_caller]
|
|
|
|
pub fn struct_expect(
|
|
|
|
&self,
|
|
|
|
msg: impl Into<DiagnosticMessage>,
|
|
|
|
id: LintExpectationId,
|
|
|
|
) -> DiagnosticBuilder<'_, ()> {
|
|
|
|
DiagnosticBuilder::new(self, Expect(id), msg)
|
2022-09-27 20:56:05 +02:00
|
|
|
}
|
2019-09-07 12:09:52 -04:00
|
|
|
}
|
|
|
|
|
2023-12-17 21:48:57 +11:00
|
|
|
// Note: we prefer implementing operations on `DiagCtxt`, rather than
|
2023-12-17 21:58:27 +11:00
|
|
|
// `DiagCtxtInner`, whenever possible. This minimizes functions where
|
2023-12-17 21:48:57 +11:00
|
|
|
// `DiagCtxt::foo()` just borrows `inner` and forwards a call to
|
2024-01-05 17:19:37 +11:00
|
|
|
// `DiagCtxtInner::foo`.
|
2023-12-17 21:58:27 +11:00
|
|
|
impl DiagCtxtInner {
|
2019-09-23 04:45:21 +02:00
|
|
|
/// Emit all stashed diagnostics.
|
Overhaul the handling of errors at the top-level.
Currently `emit_stashed_diagnostic` is called from four(!) different
places: `print_error_count`, `DiagCtxtInner::drop`, `abort_if_errors`,
and `compile_status`.
And `flush_delayed` is called from two different places:
`DiagCtxtInner::drop` and `Queries`.
This is pretty gross! Each one should really be called from a single
place, but there's a bunch of entanglements. This commit cleans up this
mess.
Specifically, it:
- Removes all the existing calls to `emit_stashed_diagnostic`, and adds
a single new call in `finish_diagnostics`.
- Removes the early `flush_delayed` call in `codegen_and_build_linker`,
replacing it with a simple early return if delayed bugs are present.
- Changes `DiagCtxtInner::drop` and `DiagCtxtInner::flush_delayed` so
they both assert that the stashed diagnostics are empty (i.e.
processed beforehand).
- Changes `interface::run_compiler` so that any errors emitted during
`finish_diagnostics` (i.e. late-emitted stashed diagnostics) are
counted and cannot be overlooked. This requires adding
`ErrorGuaranteed` return values to several functions.
- Removes the `stashed_err_count` call in `analysis`. This is possible
now that we don't have to worry about calling `flush_delayed` early
from `codegen_and_build_linker` when stashed diagnostics are pending.
- Changes the `span_bug` case in `handle_tuple_field_pattern_match` to a
`delayed_span_bug`, because it now can be reached due to the removal
of the `stashed_err_count` call in `analysis`.
- Slightly changes the expected output of three tests. If no errors are
emitted but there are delayed bugs, the error count is no longer
printed. This is because delayed bugs are now always printed after the
error count is printed (or not printed, if the error count is zero).
There is a lot going on in this commit. It's hard to break into smaller
pieces because the existing code is very tangled. It took me a long time
and a lot of effort to understand how the different pieces interact, and
I think the new code is a lot simpler and easier to understand.
2024-02-19 10:00:19 +11:00
|
|
|
fn emit_stashed_diagnostics(&mut self) -> Option<ErrorGuaranteed> {
|
|
|
|
let mut guar = None;
|
2024-02-09 16:12:18 +11:00
|
|
|
let has_errors = !self.err_guars.is_empty();
|
2024-01-15 16:20:37 +11:00
|
|
|
for (_, diag) in std::mem::take(&mut self.stashed_diagnostics).into_iter() {
|
2022-01-22 18:49:12 -06:00
|
|
|
if diag.is_error() {
|
Fix `ErrorGuaranteed` unsoundness with stash/steal.
When you stash an error, the error count is incremented. You can then
use the non-zero error count to get an `ErrorGuaranteed`. You can then
steal the error, which decrements the error count. You can then cancel
the error.
Example code:
```
fn unsound(dcx: &DiagCtxt) -> ErrorGuaranteed {
let sp = rustc_span::DUMMY_SP;
let k = rustc_errors::StashKey::Cycle;
dcx.struct_err("bogus").stash(sp, k); // increment error count on stash
let guar = dcx.has_errors().unwrap(); // ErrorGuaranteed from error count > 0
let err = dcx.steal_diagnostic(sp, k).unwrap(); // decrement error count on steal
err.cancel(); // cancel error
guar // ErrorGuaranteed with no error emitted!
}
```
This commit fixes the problem in the simplest way: by not counting
stashed errors in `DiagCtxt::{err_count,has_errors}`.
However, just doing this without any other changes leads to over 40 ui
test failures. Mostly because of uninteresting extra errors (many saying
"type annotations needed" when type inference fails), and in a few
cases, due to delayed bugs causing ICEs when no normal errors are
printed.
To fix these, this commit adds `DiagCtxt::stashed_err_count`, and uses
it in three places alongside `DiagCtxt::{has_errors,err_count}`. It's
dodgy to rely on it, because unlike `DiagCtxt::err_count` it can go up
and down. But it's needed to preserve existing behaviour, and at least
the three places that need it are now obvious.
2024-02-09 06:42:50 +11:00
|
|
|
if diag.is_lint.is_none() {
|
|
|
|
self.stashed_err_count -= 1;
|
2022-08-17 06:07:33 -05:00
|
|
|
}
|
|
|
|
} else {
|
2024-01-09 14:39:22 +11:00
|
|
|
// Unless they're forced, don't flush stashed warnings when
|
|
|
|
// there are errors, to avoid causing warning overload. The
|
|
|
|
// stash would've been stolen already if it were important.
|
|
|
|
if !diag.is_force_warn() && has_errors {
|
|
|
|
continue;
|
2022-08-17 06:07:33 -05:00
|
|
|
}
|
2022-01-22 18:49:12 -06:00
|
|
|
}
|
Overhaul the handling of errors at the top-level.
Currently `emit_stashed_diagnostic` is called from four(!) different
places: `print_error_count`, `DiagCtxtInner::drop`, `abort_if_errors`,
and `compile_status`.
And `flush_delayed` is called from two different places:
`DiagCtxtInner::drop` and `Queries`.
This is pretty gross! Each one should really be called from a single
place, but there's a bunch of entanglements. This commit cleans up this
mess.
Specifically, it:
- Removes all the existing calls to `emit_stashed_diagnostic`, and adds
a single new call in `finish_diagnostics`.
- Removes the early `flush_delayed` call in `codegen_and_build_linker`,
replacing it with a simple early return if delayed bugs are present.
- Changes `DiagCtxtInner::drop` and `DiagCtxtInner::flush_delayed` so
they both assert that the stashed diagnostics are empty (i.e.
processed beforehand).
- Changes `interface::run_compiler` so that any errors emitted during
`finish_diagnostics` (i.e. late-emitted stashed diagnostics) are
counted and cannot be overlooked. This requires adding
`ErrorGuaranteed` return values to several functions.
- Removes the `stashed_err_count` call in `analysis`. This is possible
now that we don't have to worry about calling `flush_delayed` early
from `codegen_and_build_linker` when stashed diagnostics are pending.
- Changes the `span_bug` case in `handle_tuple_field_pattern_match` to a
`delayed_span_bug`, because it now can be reached due to the removal
of the `stashed_err_count` call in `analysis`.
- Slightly changes the expected output of three tests. If no errors are
emitted but there are delayed bugs, the error count is no longer
printed. This is because delayed bugs are now always printed after the
error count is printed (or not printed, if the error count is zero).
There is a lot going on in this commit. It's hard to break into smaller
pieces because the existing code is very tangled. It took me a long time
and a lot of effort to understand how the different pieces interact, and
I think the new code is a lot simpler and easier to understand.
2024-02-19 10:00:19 +11:00
|
|
|
guar = guar.or(self.emit_diagnostic(diag));
|
2022-03-20 18:26:09 +01:00
|
|
|
}
|
Overhaul the handling of errors at the top-level.
Currently `emit_stashed_diagnostic` is called from four(!) different
places: `print_error_count`, `DiagCtxtInner::drop`, `abort_if_errors`,
and `compile_status`.
And `flush_delayed` is called from two different places:
`DiagCtxtInner::drop` and `Queries`.
This is pretty gross! Each one should really be called from a single
place, but there's a bunch of entanglements. This commit cleans up this
mess.
Specifically, it:
- Removes all the existing calls to `emit_stashed_diagnostic`, and adds
a single new call in `finish_diagnostics`.
- Removes the early `flush_delayed` call in `codegen_and_build_linker`,
replacing it with a simple early return if delayed bugs are present.
- Changes `DiagCtxtInner::drop` and `DiagCtxtInner::flush_delayed` so
they both assert that the stashed diagnostics are empty (i.e.
processed beforehand).
- Changes `interface::run_compiler` so that any errors emitted during
`finish_diagnostics` (i.e. late-emitted stashed diagnostics) are
counted and cannot be overlooked. This requires adding
`ErrorGuaranteed` return values to several functions.
- Removes the `stashed_err_count` call in `analysis`. This is possible
now that we don't have to worry about calling `flush_delayed` early
from `codegen_and_build_linker` when stashed diagnostics are pending.
- Changes the `span_bug` case in `handle_tuple_field_pattern_match` to a
`delayed_span_bug`, because it now can be reached due to the removal
of the `stashed_err_count` call in `analysis`.
- Slightly changes the expected output of three tests. If no errors are
emitted but there are delayed bugs, the error count is no longer
printed. This is because delayed bugs are now always printed after the
error count is printed (or not printed, if the error count is zero).
There is a lot going on in this commit. It's hard to break into smaller
pieces because the existing code is very tangled. It took me a long time
and a lot of effort to understand how the different pieces interact, and
I think the new code is a lot simpler and easier to understand.
2024-02-19 10:00:19 +11:00
|
|
|
guar
|
2019-09-23 04:45:21 +02:00
|
|
|
}
|
|
|
|
|
2024-02-07 10:26:50 +11:00
|
|
|
// Return value is only `Some` if the level is `Error` or `DelayedBug`.
|
2023-12-14 14:13:35 +11:00
|
|
|
fn emit_diagnostic(&mut self, mut diagnostic: Diagnostic) -> Option<ErrorGuaranteed> {
|
2024-01-31 11:23:54 +11:00
|
|
|
assert!(diagnostic.level.can_be_top_or_sub().0);
|
2022-06-05 12:33:45 +02:00
|
|
|
|
2024-01-31 15:10:23 +11:00
|
|
|
if let Some(expectation_id) = diagnostic.level.get_expectation_id() {
|
|
|
|
// The `LintExpectationId` can be stable or unstable depending on when it was created.
|
|
|
|
// Diagnostics created before the definition of `HirId`s are unstable and can not yet
|
|
|
|
// be stored. Instead, they are buffered until the `LintExpectationId` is replaced by
|
|
|
|
// a stable one by the `LintLevelsBuilder`.
|
|
|
|
if let LintExpectationId::Unstable { .. } = expectation_id {
|
|
|
|
self.unstable_expect_diagnostics.push(diagnostic);
|
2024-01-12 03:15:14 +00:00
|
|
|
return None;
|
|
|
|
}
|
2024-01-31 15:10:23 +11:00
|
|
|
self.suppressed_expected_diag = true;
|
|
|
|
self.fulfilled_expectations.insert(expectation_id.normalize());
|
Don't consider delayed bugs for `-Ztreat-err-as-bug`.
`-Ztreat-err-as-bug` treats normal errors and delayed bugs equally,
which can lead to some really surprising results.
This commit changes `-Ztreat-err-as-bug` so it ignores delayed bugs,
unless they get promoted to proper bugs and are printed.
This feels to me much simpler and more logical. And it simplifies the
implementation:
- The `-Ztreat-err-as-bug` check is removed from in
`DiagCtxt::{delayed_bug,span_delayed_bug}`.
- `treat_err_as_bug` doesn't need to count delayed bugs.
- The `-Ztreat-err-as-bug` panic message is simpler, because it doesn't
have to mention delayed bugs.
Output of delayed bugs is now more consistent. They're always printed
the same way. Previously when they triggered `-Ztreat-err-as-bug` they
would be printed slightly differently, via `span_bug` in
`span_delayed_bug` or `delayed_bug`.
A minor behaviour change: the "no errors encountered even though
`span_delayed_bug` issued" printed before delayed bugs is now a note
rather than a bug. This is done so it doesn't get counted as an error
that might trigger `-Ztreat-err-as-bug`, which would be silly.
This means that if you use `-Ztreat-err-as-bug=1` and there are no
normal errors but there are delayed bugs, the first delayed bug will be
shown (and the panic will happen after it's printed).
Also, I have added a second note saying "those delayed bugs will now be
shown as internal compiler errors". I think this makes it clearer what
is happening, because the whole concept of delayed bugs is non-obvious.
There are some test changes.
- equality-in-canonical-query.rs: Minor output changes, and the error
count reduces by one because the "no errors encountered even though
`span_delayed_bug` issued" message is no longer counted as an error.
- rpit_tait_equality_in_canonical_query.rs: Ditto.
- storage-live.rs: The query stack disappears because these delayed bugs
are now printed at the end, rather than when they are created.
- storage-return.rs, span_delayed_bug.rs: now need
`-Zeagerly-emit-delayed-bugs` because they need the delayed bugs
emitted immediately to preserve behaviour.
2024-01-12 07:38:42 +11:00
|
|
|
}
|
|
|
|
|
2020-08-13 15:41:52 -04:00
|
|
|
if diagnostic.has_future_breakage() {
|
2023-12-21 15:57:03 +11:00
|
|
|
// Future breakages aren't emitted if they're Level::Allow,
|
2022-11-10 04:21:11 +00:00
|
|
|
// but they still need to be constructed and stashed below,
|
2024-02-12 16:48:45 +11:00
|
|
|
// so they'll trigger the must_produce_diag check.
|
2022-11-10 04:21:11 +00:00
|
|
|
self.suppressed_expected_diag = true;
|
2020-08-13 15:41:52 -04:00
|
|
|
self.future_breakage_diagnostics.push(diagnostic.clone());
|
|
|
|
}
|
|
|
|
|
2024-02-13 12:19:24 +11:00
|
|
|
// Note that because this comes before the `match` below,
|
|
|
|
// `-Zeagerly-emit-delayed-bugs` continues to work even after we've
|
|
|
|
// issued an error and stopped recording new delayed bugs.
|
2024-02-12 16:48:45 +11:00
|
|
|
if diagnostic.level == DelayedBug && self.flags.eagerly_emit_delayed_bugs {
|
2024-01-31 15:10:23 +11:00
|
|
|
diagnostic.level = Error;
|
2022-06-05 12:33:45 +02:00
|
|
|
}
|
|
|
|
|
2024-01-12 03:15:14 +00:00
|
|
|
match diagnostic.level {
|
2024-02-12 16:48:45 +11:00
|
|
|
// This must come after the possible promotion of `DelayedBug` to
|
2024-01-31 11:23:54 +11:00
|
|
|
// `Error` above.
|
2024-01-31 15:10:23 +11:00
|
|
|
Fatal | Error if self.treat_next_err_as_bug() => {
|
|
|
|
diagnostic.level = Bug;
|
2024-01-12 00:30:04 +00:00
|
|
|
}
|
2024-01-31 11:23:54 +11:00
|
|
|
DelayedBug => {
|
2024-02-13 12:19:24 +11:00
|
|
|
// If we have already emitted at least one error, we don't need
|
|
|
|
// to record the delayed bug, because it'll never be used.
|
2024-02-19 09:36:08 +11:00
|
|
|
return if let Some(guar) = self.has_errors() {
|
2024-02-13 12:19:24 +11:00
|
|
|
Some(guar)
|
|
|
|
} else {
|
|
|
|
let backtrace = std::backtrace::Backtrace::capture();
|
|
|
|
// This `unchecked_error_guaranteed` is valid. It is where the
|
|
|
|
// `ErrorGuaranteed` for delayed bugs originates.
|
|
|
|
#[allow(deprecated)]
|
|
|
|
let guar = ErrorGuaranteed::unchecked_error_guaranteed();
|
|
|
|
self.delayed_bugs
|
|
|
|
.push((DelayedDiagnostic::with_backtrace(diagnostic, backtrace), guar));
|
|
|
|
Some(guar)
|
|
|
|
};
|
2024-01-12 03:15:14 +00:00
|
|
|
}
|
2024-01-31 15:10:23 +11:00
|
|
|
Warning if !self.flags.can_emit_warnings => {
|
|
|
|
if diagnostic.has_future_breakage() {
|
|
|
|
(*TRACK_DIAGNOSTIC)(diagnostic, &mut |_| {});
|
|
|
|
}
|
|
|
|
return None;
|
|
|
|
}
|
|
|
|
Allow | Expect(_) => {
|
2024-01-09 12:35:03 +11:00
|
|
|
(*TRACK_DIAGNOSTIC)(diagnostic, &mut |_| {});
|
2024-01-31 15:10:23 +11:00
|
|
|
return None;
|
2020-08-13 15:41:52 -04:00
|
|
|
}
|
2024-01-31 15:10:23 +11:00
|
|
|
_ => {}
|
2020-08-13 15:41:52 -04:00
|
|
|
}
|
|
|
|
|
2021-04-30 19:38:06 +02:00
|
|
|
let mut guaranteed = None;
|
2024-01-09 12:35:03 +11:00
|
|
|
(*TRACK_DIAGNOSTIC)(diagnostic, &mut |mut diagnostic| {
|
Stop using `String` for error codes.
Error codes are integers, but `String` is used everywhere to represent
them. Gross!
This commit introduces `ErrCode`, an integral newtype for error codes,
replacing `String`. It also introduces a constant for every error code,
e.g. `E0123`, and removes the `error_code!` macro. The constants are
imported wherever used with `use rustc_errors::codes::*`.
With the old code, we have three different ways to specify an error code
at a use point:
```
error_code!(E0123) // macro call
struct_span_code_err!(dcx, span, E0123, "msg"); // bare ident arg to macro call
\#[diag(name, code = "E0123")] // string
struct Diag;
```
With the new code, they all use the `E0123` constant.
```
E0123 // constant
struct_span_code_err!(dcx, span, E0123, "msg"); // constant
\#[diag(name, code = E0123)] // constant
struct Diag;
```
The commit also changes the structure of the error code definitions:
- `rustc_error_codes` now just defines a higher-order macro listing the
used error codes and nothing else.
- Because that's now the only thing in the `rustc_error_codes` crate, I
moved it into the `lib.rs` file and removed the `error_codes.rs` file.
- `rustc_errors` uses that macro to define everything, e.g. the error
code constants and the `DIAGNOSTIC_TABLES`. This is in its new
`codes.rs` file.
2024-01-14 10:57:07 +11:00
|
|
|
if let Some(code) = diagnostic.code {
|
|
|
|
self.emitted_diagnostic_codes.insert(code);
|
2021-04-30 19:38:06 +02:00
|
|
|
}
|
2019-09-07 12:09:52 -04:00
|
|
|
|
2023-10-04 18:34:50 +00:00
|
|
|
let already_emitted = {
|
2022-03-20 20:02:18 +01:00
|
|
|
let mut hasher = StableHasher::new();
|
2021-04-30 19:38:06 +02:00
|
|
|
diagnostic.hash(&mut hasher);
|
2022-03-20 20:02:18 +01:00
|
|
|
let diagnostic_hash = hasher.finish();
|
2023-10-04 18:34:50 +00:00
|
|
|
!self.emitted_diagnostics.insert(diagnostic_hash)
|
2022-03-20 20:02:18 +01:00
|
|
|
};
|
|
|
|
|
2024-02-02 15:44:22 +11:00
|
|
|
let is_error = diagnostic.is_error();
|
|
|
|
let is_lint = diagnostic.is_lint.is_some();
|
|
|
|
|
2021-04-30 19:38:06 +02:00
|
|
|
// Only emit the diagnostic if we've been asked to deduplicate or
|
|
|
|
// haven't already emitted an equivalent diagnostic.
|
2023-10-04 18:34:50 +00:00
|
|
|
if !(self.flags.deduplicate_diagnostics && already_emitted) {
|
2021-04-30 19:38:06 +02:00
|
|
|
debug!(?diagnostic);
|
|
|
|
debug!(?self.emitted_diagnostics);
|
2024-02-02 15:44:22 +11:00
|
|
|
|
2021-04-30 19:38:06 +02:00
|
|
|
let already_emitted_sub = |sub: &mut SubDiagnostic| {
|
|
|
|
debug!(?sub);
|
2023-12-21 15:57:03 +11:00
|
|
|
if sub.level != OnceNote && sub.level != OnceHelp {
|
2021-04-30 19:38:06 +02:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
let mut hasher = StableHasher::new();
|
|
|
|
sub.hash(&mut hasher);
|
|
|
|
let diagnostic_hash = hasher.finish();
|
|
|
|
debug!(?diagnostic_hash);
|
|
|
|
!self.emitted_diagnostics.insert(diagnostic_hash)
|
|
|
|
};
|
2023-07-03 08:40:34 +08:00
|
|
|
diagnostic.children.extract_if(already_emitted_sub).for_each(|_| {});
|
2023-10-04 18:34:50 +00:00
|
|
|
if already_emitted {
|
Reduce capabilities of `Diagnostic`.
Currently many diagnostic modifier methods are available on both
`Diagnostic` and `DiagnosticBuilder`. This commit removes most of them
from `Diagnostic`. To minimize the diff size, it keeps them within
`diagnostic.rs` but changes the surrounding `impl Diagnostic` block to
`impl DiagnosticBuilder`. (I intend to move things around later, to give
a more sensible code layout.)
`Diagnostic` keeps a few methods that it still needs, like `sub`,
`arg`, and `replace_args`.
The `forward!` macro, which defined two additional methods per call
(e.g. `note` and `with_note`), is replaced by the `with_fn!` macro,
which defines one additional method per call (e.g. `with_note`). It's
now also only used when necessary -- not all modifier methods currently
need a `with_*` form. (New ones can be easily added as necessary.)
All this also requires changing `trait AddToDiagnostic` so its methods
take `DiagnosticBuilder` instead of `Diagnostic`, which leads to many
mechanical changes. `SubdiagnosticMessageOp` gains a type parameter `G`.
There are three subdiagnostics -- `DelayedAtWithoutNewline`,
`DelayedAtWithNewline`, and `InvalidFlushedDelayedDiagnosticLevel` --
that are created within the diagnostics machinery and appended to
external diagnostics. These are handled at the `Diagnostic` level, which
means it's now hard to construct them via `derive(Diagnostic)`, so
instead we construct them by hand. This has no effect on what they look
like when printed.
There are lots of new `allow` markers for `untranslatable_diagnostics`
and `diagnostics_outside_of_impl`. This is because
`#[rustc_lint_diagnostics]` annotations were present on the `Diagnostic`
modifier methods, but missing from the `DiagnosticBuilder` modifier
methods. They're now present.
2024-02-06 16:44:30 +11:00
|
|
|
let msg = "duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`";
|
|
|
|
diagnostic.sub(Level::Note, msg, MultiSpan::new());
|
2023-10-04 18:34:50 +00:00
|
|
|
}
|
2021-04-30 19:38:06 +02:00
|
|
|
|
2024-02-02 15:44:22 +11:00
|
|
|
if is_error {
|
2021-04-30 19:38:06 +02:00
|
|
|
self.deduplicated_err_count += 1;
|
2024-01-09 12:28:45 +11:00
|
|
|
} else if matches!(diagnostic.level, ForceWarning(_) | Warning) {
|
2021-04-30 19:38:06 +02:00
|
|
|
self.deduplicated_warn_count += 1;
|
|
|
|
}
|
2024-01-09 14:39:22 +11:00
|
|
|
self.has_printed = true;
|
2024-02-02 15:44:22 +11:00
|
|
|
|
|
|
|
self.emitter.emit_diagnostic(diagnostic);
|
2019-09-07 12:09:52 -04:00
|
|
|
}
|
2024-02-07 10:26:50 +11:00
|
|
|
|
2024-02-02 15:44:22 +11:00
|
|
|
if is_error {
|
2024-02-13 12:19:24 +11:00
|
|
|
// If we have any delayed bugs recorded, we can discard them
|
|
|
|
// because they won't be used. (This should only occur if there
|
|
|
|
// have been no errors previously emitted, because we don't add
|
|
|
|
// new delayed bugs once the first error is emitted.)
|
|
|
|
if !self.delayed_bugs.is_empty() {
|
|
|
|
assert_eq!(self.lint_err_guars.len() + self.err_guars.len(), 0);
|
|
|
|
self.delayed_bugs.clear();
|
|
|
|
self.delayed_bugs.shrink_to_fit();
|
|
|
|
}
|
|
|
|
|
2024-02-09 16:12:18 +11:00
|
|
|
// This `unchecked_error_guaranteed` is valid. It is where the
|
|
|
|
// `ErrorGuaranteed` for errors and lint errors originates.
|
|
|
|
#[allow(deprecated)]
|
|
|
|
let guar = ErrorGuaranteed::unchecked_error_guaranteed();
|
|
|
|
guaranteed = Some(guar);
|
2024-02-02 15:44:22 +11:00
|
|
|
if is_lint {
|
2024-02-09 16:12:18 +11:00
|
|
|
self.lint_err_guars.push(guar);
|
2021-04-30 19:38:06 +02:00
|
|
|
} else {
|
2024-02-09 16:12:18 +11:00
|
|
|
self.err_guars.push(guar);
|
2021-04-30 19:38:06 +02:00
|
|
|
}
|
2024-01-10 14:27:02 +11:00
|
|
|
self.panic_if_treat_err_as_bug();
|
2024-02-07 10:26:50 +11:00
|
|
|
}
|
2021-04-30 19:38:06 +02:00
|
|
|
});
|
2022-01-22 18:49:12 -06:00
|
|
|
|
2021-04-30 19:38:06 +02:00
|
|
|
guaranteed
|
2019-09-07 12:09:52 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
fn treat_err_as_bug(&self) -> bool {
|
2024-02-09 16:12:18 +11:00
|
|
|
self.flags
|
|
|
|
.treat_err_as_bug
|
|
|
|
.is_some_and(|c| self.err_guars.len() + self.lint_err_guars.len() >= c.get())
|
2019-09-07 12:09:52 -04:00
|
|
|
}
|
|
|
|
|
2023-12-20 10:18:08 +11:00
|
|
|
// Use this one before incrementing `err_count`.
|
|
|
|
fn treat_next_err_as_bug(&self) -> bool {
|
Don't consider delayed bugs for `-Ztreat-err-as-bug`.
`-Ztreat-err-as-bug` treats normal errors and delayed bugs equally,
which can lead to some really surprising results.
This commit changes `-Ztreat-err-as-bug` so it ignores delayed bugs,
unless they get promoted to proper bugs and are printed.
This feels to me much simpler and more logical. And it simplifies the
implementation:
- The `-Ztreat-err-as-bug` check is removed from in
`DiagCtxt::{delayed_bug,span_delayed_bug}`.
- `treat_err_as_bug` doesn't need to count delayed bugs.
- The `-Ztreat-err-as-bug` panic message is simpler, because it doesn't
have to mention delayed bugs.
Output of delayed bugs is now more consistent. They're always printed
the same way. Previously when they triggered `-Ztreat-err-as-bug` they
would be printed slightly differently, via `span_bug` in
`span_delayed_bug` or `delayed_bug`.
A minor behaviour change: the "no errors encountered even though
`span_delayed_bug` issued" printed before delayed bugs is now a note
rather than a bug. This is done so it doesn't get counted as an error
that might trigger `-Ztreat-err-as-bug`, which would be silly.
This means that if you use `-Ztreat-err-as-bug=1` and there are no
normal errors but there are delayed bugs, the first delayed bug will be
shown (and the panic will happen after it's printed).
Also, I have added a second note saying "those delayed bugs will now be
shown as internal compiler errors". I think this makes it clearer what
is happening, because the whole concept of delayed bugs is non-obvious.
There are some test changes.
- equality-in-canonical-query.rs: Minor output changes, and the error
count reduces by one because the "no errors encountered even though
`span_delayed_bug` issued" message is no longer counted as an error.
- rpit_tait_equality_in_canonical_query.rs: Ditto.
- storage-live.rs: The query stack disappears because these delayed bugs
are now printed at the end, rather than when they are created.
- storage-return.rs, span_delayed_bug.rs: now need
`-Zeagerly-emit-delayed-bugs` because they need the delayed bugs
emitted immediately to preserve behaviour.
2024-01-12 07:38:42 +11:00
|
|
|
self.flags
|
|
|
|
.treat_err_as_bug
|
2024-02-09 16:12:18 +11:00
|
|
|
.is_some_and(|c| self.err_guars.len() + self.lint_err_guars.len() + 1 >= c.get())
|
|
|
|
}
|
|
|
|
|
2024-02-19 09:36:08 +11:00
|
|
|
fn has_errors_excluding_lint_errors(&self) -> Option<ErrorGuaranteed> {
|
2024-02-09 16:12:18 +11:00
|
|
|
self.err_guars.get(0).copied()
|
|
|
|
}
|
|
|
|
|
2024-02-19 09:36:08 +11:00
|
|
|
fn has_errors(&self) -> Option<ErrorGuaranteed> {
|
|
|
|
self.has_errors_excluding_lint_errors().or_else(|| self.lint_err_guars.get(0).copied())
|
2022-09-06 07:08:12 +00:00
|
|
|
}
|
|
|
|
|
2024-02-19 09:36:08 +11:00
|
|
|
fn has_errors_or_delayed_bugs(&self) -> Option<ErrorGuaranteed> {
|
|
|
|
self.has_errors().or_else(|| self.delayed_bugs.get(0).map(|(_, guar)| guar).copied())
|
2015-12-15 14:11:27 +13:00
|
|
|
}
|
2017-08-12 15:37:28 -07:00
|
|
|
|
2024-02-14 14:17:27 +00:00
|
|
|
/// Translate `message` eagerly with `args` to `SubdiagnosticMessage::Eager`.
|
|
|
|
pub fn eagerly_translate<'a>(
|
|
|
|
&self,
|
|
|
|
message: DiagnosticMessage,
|
|
|
|
args: impl Iterator<Item = DiagnosticArg<'a>>,
|
|
|
|
) -> SubdiagnosticMessage {
|
|
|
|
SubdiagnosticMessage::Translated(Cow::from(self.eagerly_translate_to_string(message, args)))
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Translate `message` eagerly with `args` to `String`.
|
|
|
|
pub fn eagerly_translate_to_string<'a>(
|
|
|
|
&self,
|
|
|
|
message: DiagnosticMessage,
|
|
|
|
args: impl Iterator<Item = DiagnosticArg<'a>>,
|
|
|
|
) -> String {
|
|
|
|
let args = crate::translation::to_fluent_args(args);
|
|
|
|
self.emitter.translate_message(&message, &args).map_err(Report::new).unwrap().to_string()
|
|
|
|
}
|
|
|
|
|
Reduce capabilities of `Diagnostic`.
Currently many diagnostic modifier methods are available on both
`Diagnostic` and `DiagnosticBuilder`. This commit removes most of them
from `Diagnostic`. To minimize the diff size, it keeps them within
`diagnostic.rs` but changes the surrounding `impl Diagnostic` block to
`impl DiagnosticBuilder`. (I intend to move things around later, to give
a more sensible code layout.)
`Diagnostic` keeps a few methods that it still needs, like `sub`,
`arg`, and `replace_args`.
The `forward!` macro, which defined two additional methods per call
(e.g. `note` and `with_note`), is replaced by the `with_fn!` macro,
which defines one additional method per call (e.g. `with_note`). It's
now also only used when necessary -- not all modifier methods currently
need a `with_*` form. (New ones can be easily added as necessary.)
All this also requires changing `trait AddToDiagnostic` so its methods
take `DiagnosticBuilder` instead of `Diagnostic`, which leads to many
mechanical changes. `SubdiagnosticMessageOp` gains a type parameter `G`.
There are three subdiagnostics -- `DelayedAtWithoutNewline`,
`DelayedAtWithNewline`, and `InvalidFlushedDelayedDiagnosticLevel` --
that are created within the diagnostics machinery and appended to
external diagnostics. These are handled at the `Diagnostic` level, which
means it's now hard to construct them via `derive(Diagnostic)`, so
instead we construct them by hand. This has no effect on what they look
like when printed.
There are lots of new `allow` markers for `untranslatable_diagnostics`
and `diagnostics_outside_of_impl`. This is because
`#[rustc_lint_diagnostics]` annotations were present on the `Diagnostic`
modifier methods, but missing from the `DiagnosticBuilder` modifier
methods. They're now present.
2024-02-06 16:44:30 +11:00
|
|
|
fn eagerly_translate_for_subdiag(
|
|
|
|
&self,
|
|
|
|
diag: &Diagnostic,
|
|
|
|
msg: impl Into<SubdiagnosticMessage>,
|
|
|
|
) -> SubdiagnosticMessage {
|
|
|
|
let msg = diag.subdiagnostic_message_to_diagnostic_message(msg);
|
2024-02-16 06:07:49 +11:00
|
|
|
self.eagerly_translate(msg, diag.args.iter())
|
Reduce capabilities of `Diagnostic`.
Currently many diagnostic modifier methods are available on both
`Diagnostic` and `DiagnosticBuilder`. This commit removes most of them
from `Diagnostic`. To minimize the diff size, it keeps them within
`diagnostic.rs` but changes the surrounding `impl Diagnostic` block to
`impl DiagnosticBuilder`. (I intend to move things around later, to give
a more sensible code layout.)
`Diagnostic` keeps a few methods that it still needs, like `sub`,
`arg`, and `replace_args`.
The `forward!` macro, which defined two additional methods per call
(e.g. `note` and `with_note`), is replaced by the `with_fn!` macro,
which defines one additional method per call (e.g. `with_note`). It's
now also only used when necessary -- not all modifier methods currently
need a `with_*` form. (New ones can be easily added as necessary.)
All this also requires changing `trait AddToDiagnostic` so its methods
take `DiagnosticBuilder` instead of `Diagnostic`, which leads to many
mechanical changes. `SubdiagnosticMessageOp` gains a type parameter `G`.
There are three subdiagnostics -- `DelayedAtWithoutNewline`,
`DelayedAtWithNewline`, and `InvalidFlushedDelayedDiagnosticLevel` --
that are created within the diagnostics machinery and appended to
external diagnostics. These are handled at the `Diagnostic` level, which
means it's now hard to construct them via `derive(Diagnostic)`, so
instead we construct them by hand. This has no effect on what they look
like when printed.
There are lots of new `allow` markers for `untranslatable_diagnostics`
and `diagnostics_outside_of_impl`. This is because
`#[rustc_lint_diagnostics]` annotations were present on the `Diagnostic`
modifier methods, but missing from the `DiagnosticBuilder` modifier
methods. They're now present.
2024-02-06 16:44:30 +11:00
|
|
|
}
|
|
|
|
|
2024-02-12 16:48:45 +11:00
|
|
|
fn flush_delayed(&mut self) {
|
Overhaul the handling of errors at the top-level.
Currently `emit_stashed_diagnostic` is called from four(!) different
places: `print_error_count`, `DiagCtxtInner::drop`, `abort_if_errors`,
and `compile_status`.
And `flush_delayed` is called from two different places:
`DiagCtxtInner::drop` and `Queries`.
This is pretty gross! Each one should really be called from a single
place, but there's a bunch of entanglements. This commit cleans up this
mess.
Specifically, it:
- Removes all the existing calls to `emit_stashed_diagnostic`, and adds
a single new call in `finish_diagnostics`.
- Removes the early `flush_delayed` call in `codegen_and_build_linker`,
replacing it with a simple early return if delayed bugs are present.
- Changes `DiagCtxtInner::drop` and `DiagCtxtInner::flush_delayed` so
they both assert that the stashed diagnostics are empty (i.e.
processed beforehand).
- Changes `interface::run_compiler` so that any errors emitted during
`finish_diagnostics` (i.e. late-emitted stashed diagnostics) are
counted and cannot be overlooked. This requires adding
`ErrorGuaranteed` return values to several functions.
- Removes the `stashed_err_count` call in `analysis`. This is possible
now that we don't have to worry about calling `flush_delayed` early
from `codegen_and_build_linker` when stashed diagnostics are pending.
- Changes the `span_bug` case in `handle_tuple_field_pattern_match` to a
`delayed_span_bug`, because it now can be reached due to the removal
of the `stashed_err_count` call in `analysis`.
- Slightly changes the expected output of three tests. If no errors are
emitted but there are delayed bugs, the error count is no longer
printed. This is because delayed bugs are now always printed after the
error count is printed (or not printed, if the error count is zero).
There is a lot going on in this commit. It's hard to break into smaller
pieces because the existing code is very tangled. It took me a long time
and a lot of effort to understand how the different pieces interact, and
I think the new code is a lot simpler and easier to understand.
2024-02-19 10:00:19 +11:00
|
|
|
// Stashed diagnostics must be emitted before delayed bugs are flushed.
|
|
|
|
// Otherwise, we might ICE prematurely when errors would have
|
|
|
|
// eventually happened.
|
|
|
|
assert!(self.stashed_diagnostics.is_empty());
|
|
|
|
|
2024-02-12 16:48:45 +11:00
|
|
|
if self.delayed_bugs.is_empty() {
|
2023-12-19 17:59:04 +11:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2024-02-12 16:48:45 +11:00
|
|
|
let bugs: Vec<_> =
|
|
|
|
std::mem::take(&mut self.delayed_bugs).into_iter().map(|(b, _)| b).collect();
|
|
|
|
|
2023-03-03 22:25:18 +00:00
|
|
|
// If backtraces are enabled, also print the query stack
|
|
|
|
let backtrace = std::env::var_os("RUST_BACKTRACE").map_or(true, |x| &x != "0");
|
2023-12-19 17:59:04 +11:00
|
|
|
for (i, bug) in bugs.into_iter().enumerate() {
|
2023-03-03 22:25:18 +00:00
|
|
|
if let Some(file) = self.ice_file.as_ref()
|
2023-07-27 12:32:22 +00:00
|
|
|
&& let Ok(mut out) = std::fs::File::options().create(true).append(true).open(file)
|
2023-03-03 22:25:18 +00:00
|
|
|
{
|
|
|
|
let _ = write!(
|
|
|
|
&mut out,
|
2024-02-12 15:26:59 +11:00
|
|
|
"delayed bug: {}\n{}\n",
|
2023-03-03 22:25:18 +00:00
|
|
|
bug.inner
|
2024-02-01 19:17:39 +11:00
|
|
|
.messages
|
2023-03-03 22:25:18 +00:00
|
|
|
.iter()
|
|
|
|
.filter_map(|(msg, _)| msg.as_str())
|
|
|
|
.collect::<String>(),
|
|
|
|
&bug.note
|
|
|
|
);
|
|
|
|
}
|
2022-12-31 01:56:59 +00:00
|
|
|
|
2023-12-19 17:59:04 +11:00
|
|
|
if i == 0 {
|
2022-01-23 23:11:37 +00:00
|
|
|
// Put the overall explanation before the `DelayedBug`s, to
|
Don't consider delayed bugs for `-Ztreat-err-as-bug`.
`-Ztreat-err-as-bug` treats normal errors and delayed bugs equally,
which can lead to some really surprising results.
This commit changes `-Ztreat-err-as-bug` so it ignores delayed bugs,
unless they get promoted to proper bugs and are printed.
This feels to me much simpler and more logical. And it simplifies the
implementation:
- The `-Ztreat-err-as-bug` check is removed from in
`DiagCtxt::{delayed_bug,span_delayed_bug}`.
- `treat_err_as_bug` doesn't need to count delayed bugs.
- The `-Ztreat-err-as-bug` panic message is simpler, because it doesn't
have to mention delayed bugs.
Output of delayed bugs is now more consistent. They're always printed
the same way. Previously when they triggered `-Ztreat-err-as-bug` they
would be printed slightly differently, via `span_bug` in
`span_delayed_bug` or `delayed_bug`.
A minor behaviour change: the "no errors encountered even though
`span_delayed_bug` issued" printed before delayed bugs is now a note
rather than a bug. This is done so it doesn't get counted as an error
that might trigger `-Ztreat-err-as-bug`, which would be silly.
This means that if you use `-Ztreat-err-as-bug=1` and there are no
normal errors but there are delayed bugs, the first delayed bug will be
shown (and the panic will happen after it's printed).
Also, I have added a second note saying "those delayed bugs will now be
shown as internal compiler errors". I think this makes it clearer what
is happening, because the whole concept of delayed bugs is non-obvious.
There are some test changes.
- equality-in-canonical-query.rs: Minor output changes, and the error
count reduces by one because the "no errors encountered even though
`span_delayed_bug` issued" message is no longer counted as an error.
- rpit_tait_equality_in_canonical_query.rs: Ditto.
- storage-live.rs: The query stack disappears because these delayed bugs
are now printed at the end, rather than when they are created.
- storage-return.rs, span_delayed_bug.rs: now need
`-Zeagerly-emit-delayed-bugs` because they need the delayed bugs
emitted immediately to preserve behaviour.
2024-01-12 07:38:42 +11:00
|
|
|
// frame them better (e.g. separate warnings from them). Also,
|
|
|
|
// make it a note so it doesn't count as an error, because that
|
|
|
|
// could trigger `-Ztreat-err-as-bug`, which we don't want.
|
2024-02-12 16:48:45 +11:00
|
|
|
let note1 = "no errors encountered even though delayed bugs were created";
|
|
|
|
let note2 = "those delayed bugs will now be shown as internal compiler errors";
|
Don't consider delayed bugs for `-Ztreat-err-as-bug`.
`-Ztreat-err-as-bug` treats normal errors and delayed bugs equally,
which can lead to some really surprising results.
This commit changes `-Ztreat-err-as-bug` so it ignores delayed bugs,
unless they get promoted to proper bugs and are printed.
This feels to me much simpler and more logical. And it simplifies the
implementation:
- The `-Ztreat-err-as-bug` check is removed from in
`DiagCtxt::{delayed_bug,span_delayed_bug}`.
- `treat_err_as_bug` doesn't need to count delayed bugs.
- The `-Ztreat-err-as-bug` panic message is simpler, because it doesn't
have to mention delayed bugs.
Output of delayed bugs is now more consistent. They're always printed
the same way. Previously when they triggered `-Ztreat-err-as-bug` they
would be printed slightly differently, via `span_bug` in
`span_delayed_bug` or `delayed_bug`.
A minor behaviour change: the "no errors encountered even though
`span_delayed_bug` issued" printed before delayed bugs is now a note
rather than a bug. This is done so it doesn't get counted as an error
that might trigger `-Ztreat-err-as-bug`, which would be silly.
This means that if you use `-Ztreat-err-as-bug=1` and there are no
normal errors but there are delayed bugs, the first delayed bug will be
shown (and the panic will happen after it's printed).
Also, I have added a second note saying "those delayed bugs will now be
shown as internal compiler errors". I think this makes it clearer what
is happening, because the whole concept of delayed bugs is non-obvious.
There are some test changes.
- equality-in-canonical-query.rs: Minor output changes, and the error
count reduces by one because the "no errors encountered even though
`span_delayed_bug` issued" message is no longer counted as an error.
- rpit_tait_equality_in_canonical_query.rs: Ditto.
- storage-live.rs: The query stack disappears because these delayed bugs
are now printed at the end, rather than when they are created.
- storage-return.rs, span_delayed_bug.rs: now need
`-Zeagerly-emit-delayed-bugs` because they need the delayed bugs
emitted immediately to preserve behaviour.
2024-01-12 07:38:42 +11:00
|
|
|
self.emit_diagnostic(Diagnostic::new(Note, note1));
|
|
|
|
self.emit_diagnostic(Diagnostic::new(Note, note2));
|
2022-01-23 23:11:37 +00:00
|
|
|
}
|
|
|
|
|
2023-12-19 17:59:04 +11:00
|
|
|
let mut bug =
|
2024-02-14 14:17:27 +00:00
|
|
|
if backtrace || self.ice_file.is_none() { bug.decorate(self) } else { bug.inner };
|
2023-12-19 17:59:04 +11:00
|
|
|
|
2024-01-31 11:23:54 +11:00
|
|
|
// "Undelay" the delayed bugs (into plain `Bug`s).
|
2024-02-12 16:48:45 +11:00
|
|
|
if bug.level != DelayedBug {
|
2022-01-23 23:11:37 +00:00
|
|
|
// NOTE(eddyb) not panicking here because we're already producing
|
|
|
|
// an ICE, and the more information the merrier.
|
Reduce capabilities of `Diagnostic`.
Currently many diagnostic modifier methods are available on both
`Diagnostic` and `DiagnosticBuilder`. This commit removes most of them
from `Diagnostic`. To minimize the diff size, it keeps them within
`diagnostic.rs` but changes the surrounding `impl Diagnostic` block to
`impl DiagnosticBuilder`. (I intend to move things around later, to give
a more sensible code layout.)
`Diagnostic` keeps a few methods that it still needs, like `sub`,
`arg`, and `replace_args`.
The `forward!` macro, which defined two additional methods per call
(e.g. `note` and `with_note`), is replaced by the `with_fn!` macro,
which defines one additional method per call (e.g. `with_note`). It's
now also only used when necessary -- not all modifier methods currently
need a `with_*` form. (New ones can be easily added as necessary.)
All this also requires changing `trait AddToDiagnostic` so its methods
take `DiagnosticBuilder` instead of `Diagnostic`, which leads to many
mechanical changes. `SubdiagnosticMessageOp` gains a type parameter `G`.
There are three subdiagnostics -- `DelayedAtWithoutNewline`,
`DelayedAtWithNewline`, and `InvalidFlushedDelayedDiagnosticLevel` --
that are created within the diagnostics machinery and appended to
external diagnostics. These are handled at the `Diagnostic` level, which
means it's now hard to construct them via `derive(Diagnostic)`, so
instead we construct them by hand. This has no effect on what they look
like when printed.
There are lots of new `allow` markers for `untranslatable_diagnostics`
and `diagnostics_outside_of_impl`. This is because
`#[rustc_lint_diagnostics]` annotations were present on the `Diagnostic`
modifier methods, but missing from the `DiagnosticBuilder` modifier
methods. They're now present.
2024-02-06 16:44:30 +11:00
|
|
|
//
|
|
|
|
// We are at the `Diagnostic`/`DiagCtxtInner` level rather than
|
|
|
|
// the usual `DiagnosticBuilder`/`DiagCtxt` level, so we must
|
|
|
|
// augment `bug` in a lower-level fashion.
|
|
|
|
bug.arg("level", bug.level);
|
|
|
|
let msg = crate::fluent_generated::errors_invalid_flushed_delayed_diagnostic_level;
|
|
|
|
let msg = self.eagerly_translate_for_subdiag(&bug, msg); // after the `arg` call
|
|
|
|
bug.sub(Level::Note, msg, bug.span.primary_span().unwrap().into());
|
2022-01-23 23:11:37 +00:00
|
|
|
}
|
2023-12-21 15:57:03 +11:00
|
|
|
bug.level = Bug;
|
2015-12-15 14:11:27 +13:00
|
|
|
|
2023-12-14 14:13:35 +11:00
|
|
|
self.emit_diagnostic(bug);
|
2020-08-22 22:24:48 +03:00
|
|
|
}
|
2022-01-23 23:11:37 +00:00
|
|
|
|
2022-12-31 01:56:59 +00:00
|
|
|
// Panic with `DelayedBugPanic` to avoid "unexpected panic" messages.
|
2023-12-19 17:59:04 +11:00
|
|
|
panic::panic_any(DelayedBugPanic);
|
2020-08-22 22:24:48 +03:00
|
|
|
}
|
|
|
|
|
2019-09-07 12:09:52 -04:00
|
|
|
fn panic_if_treat_err_as_bug(&self) {
|
|
|
|
if self.treat_err_as_bug() {
|
Don't consider delayed bugs for `-Ztreat-err-as-bug`.
`-Ztreat-err-as-bug` treats normal errors and delayed bugs equally,
which can lead to some really surprising results.
This commit changes `-Ztreat-err-as-bug` so it ignores delayed bugs,
unless they get promoted to proper bugs and are printed.
This feels to me much simpler and more logical. And it simplifies the
implementation:
- The `-Ztreat-err-as-bug` check is removed from in
`DiagCtxt::{delayed_bug,span_delayed_bug}`.
- `treat_err_as_bug` doesn't need to count delayed bugs.
- The `-Ztreat-err-as-bug` panic message is simpler, because it doesn't
have to mention delayed bugs.
Output of delayed bugs is now more consistent. They're always printed
the same way. Previously when they triggered `-Ztreat-err-as-bug` they
would be printed slightly differently, via `span_bug` in
`span_delayed_bug` or `delayed_bug`.
A minor behaviour change: the "no errors encountered even though
`span_delayed_bug` issued" printed before delayed bugs is now a note
rather than a bug. This is done so it doesn't get counted as an error
that might trigger `-Ztreat-err-as-bug`, which would be silly.
This means that if you use `-Ztreat-err-as-bug=1` and there are no
normal errors but there are delayed bugs, the first delayed bug will be
shown (and the panic will happen after it's printed).
Also, I have added a second note saying "those delayed bugs will now be
shown as internal compiler errors". I think this makes it clearer what
is happening, because the whole concept of delayed bugs is non-obvious.
There are some test changes.
- equality-in-canonical-query.rs: Minor output changes, and the error
count reduces by one because the "no errors encountered even though
`span_delayed_bug` issued" message is no longer counted as an error.
- rpit_tait_equality_in_canonical_query.rs: Ditto.
- storage-live.rs: The query stack disappears because these delayed bugs
are now printed at the end, rather than when they are created.
- storage-return.rs, span_delayed_bug.rs: now need
`-Zeagerly-emit-delayed-bugs` because they need the delayed bugs
emitted immediately to preserve behaviour.
2024-01-12 07:38:42 +11:00
|
|
|
let n = self.flags.treat_err_as_bug.map(|c| c.get()).unwrap();
|
2024-02-09 16:12:18 +11:00
|
|
|
assert_eq!(n, self.err_guars.len() + self.lint_err_guars.len());
|
Don't consider delayed bugs for `-Ztreat-err-as-bug`.
`-Ztreat-err-as-bug` treats normal errors and delayed bugs equally,
which can lead to some really surprising results.
This commit changes `-Ztreat-err-as-bug` so it ignores delayed bugs,
unless they get promoted to proper bugs and are printed.
This feels to me much simpler and more logical. And it simplifies the
implementation:
- The `-Ztreat-err-as-bug` check is removed from in
`DiagCtxt::{delayed_bug,span_delayed_bug}`.
- `treat_err_as_bug` doesn't need to count delayed bugs.
- The `-Ztreat-err-as-bug` panic message is simpler, because it doesn't
have to mention delayed bugs.
Output of delayed bugs is now more consistent. They're always printed
the same way. Previously when they triggered `-Ztreat-err-as-bug` they
would be printed slightly differently, via `span_bug` in
`span_delayed_bug` or `delayed_bug`.
A minor behaviour change: the "no errors encountered even though
`span_delayed_bug` issued" printed before delayed bugs is now a note
rather than a bug. This is done so it doesn't get counted as an error
that might trigger `-Ztreat-err-as-bug`, which would be silly.
This means that if you use `-Ztreat-err-as-bug=1` and there are no
normal errors but there are delayed bugs, the first delayed bug will be
shown (and the panic will happen after it's printed).
Also, I have added a second note saying "those delayed bugs will now be
shown as internal compiler errors". I think this makes it clearer what
is happening, because the whole concept of delayed bugs is non-obvious.
There are some test changes.
- equality-in-canonical-query.rs: Minor output changes, and the error
count reduces by one because the "no errors encountered even though
`span_delayed_bug` issued" message is no longer counted as an error.
- rpit_tait_equality_in_canonical_query.rs: Ditto.
- storage-live.rs: The query stack disappears because these delayed bugs
are now printed at the end, rather than when they are created.
- storage-return.rs, span_delayed_bug.rs: now need
`-Zeagerly-emit-delayed-bugs` because they need the delayed bugs
emitted immediately to preserve behaviour.
2024-01-12 07:38:42 +11:00
|
|
|
if n == 1 {
|
|
|
|
panic!("aborting due to `-Z treat-err-as-bug=1`");
|
|
|
|
} else {
|
|
|
|
panic!("aborting after {n} errors due to `-Z treat-err-as-bug={n}`");
|
2020-09-18 05:57:01 +00:00
|
|
|
}
|
2019-09-07 12:09:52 -04:00
|
|
|
}
|
2019-04-15 08:26:08 +10:00
|
|
|
}
|
|
|
|
}
|
2015-12-15 14:11:27 +13:00
|
|
|
|
2021-05-05 22:52:58 +02:00
|
|
|
struct DelayedDiagnostic {
|
|
|
|
inner: Diagnostic,
|
|
|
|
note: Backtrace,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl DelayedDiagnostic {
|
|
|
|
fn with_backtrace(diagnostic: Diagnostic, backtrace: Backtrace) -> Self {
|
|
|
|
DelayedDiagnostic { inner: diagnostic, note: backtrace }
|
|
|
|
}
|
|
|
|
|
Reduce capabilities of `Diagnostic`.
Currently many diagnostic modifier methods are available on both
`Diagnostic` and `DiagnosticBuilder`. This commit removes most of them
from `Diagnostic`. To minimize the diff size, it keeps them within
`diagnostic.rs` but changes the surrounding `impl Diagnostic` block to
`impl DiagnosticBuilder`. (I intend to move things around later, to give
a more sensible code layout.)
`Diagnostic` keeps a few methods that it still needs, like `sub`,
`arg`, and `replace_args`.
The `forward!` macro, which defined two additional methods per call
(e.g. `note` and `with_note`), is replaced by the `with_fn!` macro,
which defines one additional method per call (e.g. `with_note`). It's
now also only used when necessary -- not all modifier methods currently
need a `with_*` form. (New ones can be easily added as necessary.)
All this also requires changing `trait AddToDiagnostic` so its methods
take `DiagnosticBuilder` instead of `Diagnostic`, which leads to many
mechanical changes. `SubdiagnosticMessageOp` gains a type parameter `G`.
There are three subdiagnostics -- `DelayedAtWithoutNewline`,
`DelayedAtWithNewline`, and `InvalidFlushedDelayedDiagnosticLevel` --
that are created within the diagnostics machinery and appended to
external diagnostics. These are handled at the `Diagnostic` level, which
means it's now hard to construct them via `derive(Diagnostic)`, so
instead we construct them by hand. This has no effect on what they look
like when printed.
There are lots of new `allow` markers for `untranslatable_diagnostics`
and `diagnostics_outside_of_impl`. This is because
`#[rustc_lint_diagnostics]` annotations were present on the `Diagnostic`
modifier methods, but missing from the `DiagnosticBuilder` modifier
methods. They're now present.
2024-02-06 16:44:30 +11:00
|
|
|
fn decorate(self, dcx: &DiagCtxtInner) -> Diagnostic {
|
|
|
|
// We are at the `Diagnostic`/`DiagCtxtInner` level rather than the
|
|
|
|
// usual `DiagnosticBuilder`/`DiagCtxt` level, so we must construct
|
|
|
|
// `diag` in a lower-level fashion.
|
|
|
|
let mut diag = self.inner;
|
|
|
|
let msg = match self.note.status() {
|
|
|
|
BacktraceStatus::Captured => crate::fluent_generated::errors_delayed_at_with_newline,
|
2023-06-06 19:24:33 +00:00
|
|
|
// Avoid the needless newline when no backtrace has been captured,
|
|
|
|
// the display impl should just be a single line.
|
Reduce capabilities of `Diagnostic`.
Currently many diagnostic modifier methods are available on both
`Diagnostic` and `DiagnosticBuilder`. This commit removes most of them
from `Diagnostic`. To minimize the diff size, it keeps them within
`diagnostic.rs` but changes the surrounding `impl Diagnostic` block to
`impl DiagnosticBuilder`. (I intend to move things around later, to give
a more sensible code layout.)
`Diagnostic` keeps a few methods that it still needs, like `sub`,
`arg`, and `replace_args`.
The `forward!` macro, which defined two additional methods per call
(e.g. `note` and `with_note`), is replaced by the `with_fn!` macro,
which defines one additional method per call (e.g. `with_note`). It's
now also only used when necessary -- not all modifier methods currently
need a `with_*` form. (New ones can be easily added as necessary.)
All this also requires changing `trait AddToDiagnostic` so its methods
take `DiagnosticBuilder` instead of `Diagnostic`, which leads to many
mechanical changes. `SubdiagnosticMessageOp` gains a type parameter `G`.
There are three subdiagnostics -- `DelayedAtWithoutNewline`,
`DelayedAtWithNewline`, and `InvalidFlushedDelayedDiagnosticLevel` --
that are created within the diagnostics machinery and appended to
external diagnostics. These are handled at the `Diagnostic` level, which
means it's now hard to construct them via `derive(Diagnostic)`, so
instead we construct them by hand. This has no effect on what they look
like when printed.
There are lots of new `allow` markers for `untranslatable_diagnostics`
and `diagnostics_outside_of_impl`. This is because
`#[rustc_lint_diagnostics]` annotations were present on the `Diagnostic`
modifier methods, but missing from the `DiagnosticBuilder` modifier
methods. They're now present.
2024-02-06 16:44:30 +11:00
|
|
|
_ => crate::fluent_generated::errors_delayed_at_without_newline,
|
|
|
|
};
|
|
|
|
diag.arg("emitted_at", diag.emitted_at.clone());
|
|
|
|
diag.arg("note", self.note);
|
|
|
|
let msg = dcx.eagerly_translate_for_subdiag(&diag, msg); // after the `arg` calls
|
|
|
|
diag.sub(Level::Note, msg, diag.span.primary_span().unwrap_or(DUMMY_SP).into());
|
|
|
|
diag
|
2021-05-05 22:52:58 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2024-01-31 11:23:54 +11:00
|
|
|
/// Level is_error EmissionGuarantee Top-level Sub Used in lints?
|
|
|
|
/// ----- -------- ----------------- --------- --- --------------
|
|
|
|
/// Bug yes BugAbort yes - -
|
|
|
|
/// Fatal yes FatalAbort/FatalError(*) yes - -
|
|
|
|
/// Error yes ErrorGuaranteed yes - yes
|
|
|
|
/// DelayedBug yes ErrorGuaranteed yes - -
|
|
|
|
/// ForceWarning - () yes - lint-only
|
|
|
|
/// Warning - () yes yes yes
|
|
|
|
/// Note - () rare yes -
|
|
|
|
/// OnceNote - () - yes lint-only
|
|
|
|
/// Help - () rare yes -
|
|
|
|
/// OnceHelp - () - yes lint-only
|
|
|
|
/// FailureNote - () rare - -
|
|
|
|
/// Allow - () yes - lint-only
|
|
|
|
/// Expect - () yes - lint-only
|
|
|
|
///
|
|
|
|
/// (*) `FatalAbort` normally, `FatalError` in the non-aborting "almost fatal" case that is
|
|
|
|
/// occasionally used.
|
|
|
|
///
|
2022-01-27 09:44:25 +00:00
|
|
|
#[derive(Copy, PartialEq, Eq, Clone, Hash, Debug, Encodable, Decodable)]
|
2015-12-15 14:11:27 +13:00
|
|
|
pub enum Level {
|
2023-12-19 13:24:34 +11:00
|
|
|
/// For bugs in the compiler. Manifests as an ICE (internal compiler error) panic.
|
2015-12-15 14:11:27 +13:00
|
|
|
Bug,
|
2023-12-19 13:24:34 +11:00
|
|
|
|
|
|
|
/// An error that causes an immediate abort. Used for things like configuration errors,
|
|
|
|
/// internal overflows, some file operation errors.
|
2015-12-15 14:11:27 +13:00
|
|
|
Fatal,
|
2023-12-19 13:24:34 +11:00
|
|
|
|
|
|
|
/// An error in the code being compiled, which prevents compilation from finishing. This is the
|
|
|
|
/// most common case.
|
2024-01-04 11:44:37 +11:00
|
|
|
Error,
|
2023-12-19 13:24:34 +11:00
|
|
|
|
2024-01-31 11:23:54 +11:00
|
|
|
/// This is a strange one: lets you register an error without emitting it. If compilation ends
|
|
|
|
/// without any other errors occurring, this will be emitted as a bug. Otherwise, it will be
|
|
|
|
/// silently dropped. I.e. "expect other errors are emitted" semantics. Useful on code paths
|
|
|
|
/// that should only be reached when compiling erroneous code.
|
|
|
|
DelayedBug,
|
|
|
|
|
2024-01-09 12:28:45 +11:00
|
|
|
/// A `force-warn` lint warning about the code being compiled. Does not prevent compilation
|
|
|
|
/// from finishing.
|
2023-12-19 13:24:34 +11:00
|
|
|
///
|
2024-01-09 12:28:45 +11:00
|
|
|
/// The [`LintExpectationId`] is used for expected lint diagnostics. In all other cases this
|
|
|
|
/// should be `None`.
|
|
|
|
ForceWarning(Option<LintExpectationId>),
|
|
|
|
|
|
|
|
/// A warning about the code being compiled. Does not prevent compilation from finishing.
|
2024-02-08 16:09:30 +11:00
|
|
|
/// Will be skipped if `can_emit_warnings` is false.
|
2024-01-09 12:28:45 +11:00
|
|
|
Warning,
|
2023-12-19 13:24:34 +11:00
|
|
|
|
2024-01-31 11:23:54 +11:00
|
|
|
/// A message giving additional context.
|
2015-12-15 14:11:27 +13:00
|
|
|
Note,
|
2023-12-19 13:24:34 +11:00
|
|
|
|
2024-01-31 11:23:54 +11:00
|
|
|
/// A note that is only emitted once.
|
2022-03-20 20:02:18 +01:00
|
|
|
OnceNote,
|
2023-12-19 13:24:34 +11:00
|
|
|
|
2024-01-31 11:23:54 +11:00
|
|
|
/// A message suggesting how to fix something.
|
2015-12-15 14:11:27 +13:00
|
|
|
Help,
|
2023-12-19 13:24:34 +11:00
|
|
|
|
2024-01-31 11:23:54 +11:00
|
|
|
/// A help that is only emitted once.
|
2023-07-25 19:37:45 +02:00
|
|
|
OnceHelp,
|
2023-12-19 13:24:34 +11:00
|
|
|
|
2024-01-31 09:25:42 +11:00
|
|
|
/// Similar to `Note`, but used in cases where compilation has failed. When printed for human
|
2024-01-31 11:23:54 +11:00
|
|
|
/// consumption, it doesn't have any kind of `note:` label.
|
2018-02-28 16:17:44 +01:00
|
|
|
FailureNote,
|
2023-12-19 13:24:34 +11:00
|
|
|
|
|
|
|
/// Only used for lints.
|
2020-08-13 15:41:52 -04:00
|
|
|
Allow,
|
2023-12-19 13:24:34 +11:00
|
|
|
|
|
|
|
/// Only used for lints.
|
2021-08-06 23:18:16 +02:00
|
|
|
Expect(LintExpectationId),
|
2015-12-15 14:11:27 +13:00
|
|
|
}
|
|
|
|
|
|
|
|
impl fmt::Display for Level {
|
2019-02-07 03:53:01 +09:00
|
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
2015-12-31 18:47:14 +13:00
|
|
|
self.to_str().fmt(f)
|
2015-12-15 14:11:27 +13:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Level {
|
2018-02-27 10:33:02 -08:00
|
|
|
fn color(self) -> ColorSpec {
|
|
|
|
let mut spec = ColorSpec::new();
|
2015-12-15 14:11:27 +13:00
|
|
|
match self {
|
2024-02-12 16:48:45 +11:00
|
|
|
Bug | Fatal | Error | DelayedBug => {
|
2018-02-27 10:33:02 -08:00
|
|
|
spec.set_fg(Some(Color::Red)).set_intense(true);
|
|
|
|
}
|
2024-01-09 12:28:45 +11:00
|
|
|
ForceWarning(_) | Warning => {
|
2018-02-27 10:33:02 -08:00
|
|
|
spec.set_fg(Some(Color::Yellow)).set_intense(cfg!(windows));
|
|
|
|
}
|
2022-03-20 20:02:18 +01:00
|
|
|
Note | OnceNote => {
|
2018-02-27 10:33:02 -08:00
|
|
|
spec.set_fg(Some(Color::Green)).set_intense(true);
|
|
|
|
}
|
2023-07-25 19:37:45 +02:00
|
|
|
Help | OnceHelp => {
|
2018-02-27 10:33:02 -08:00
|
|
|
spec.set_fg(Some(Color::Cyan)).set_intense(true);
|
2016-10-18 23:13:02 +05:30
|
|
|
}
|
2018-02-28 16:17:44 +01:00
|
|
|
FailureNote => {}
|
2021-08-06 23:18:16 +02:00
|
|
|
Allow | Expect(_) => unreachable!(),
|
2015-12-15 14:11:27 +13:00
|
|
|
}
|
2018-02-28 16:17:44 +01:00
|
|
|
spec
|
2015-12-15 14:11:27 +13:00
|
|
|
}
|
2015-12-31 18:47:14 +13:00
|
|
|
|
2016-06-21 18:08:13 -04:00
|
|
|
pub fn to_str(self) -> &'static str {
|
2015-12-31 18:47:14 +13:00
|
|
|
match self {
|
2024-02-12 16:48:45 +11:00
|
|
|
Bug | DelayedBug => "error: internal compiler error",
|
2024-01-04 11:44:37 +11:00
|
|
|
Fatal | Error => "error",
|
2024-01-09 12:28:45 +11:00
|
|
|
ForceWarning(_) | Warning => "warning",
|
2022-03-20 20:02:18 +01:00
|
|
|
Note | OnceNote => "note",
|
2023-07-25 19:37:45 +02:00
|
|
|
Help | OnceHelp => "help",
|
2019-09-13 06:48:47 -07:00
|
|
|
FailureNote => "failure-note",
|
2023-12-19 13:24:34 +11:00
|
|
|
Allow | Expect(_) => unreachable!(),
|
2015-12-31 18:47:14 +13:00
|
|
|
}
|
|
|
|
}
|
2018-02-28 16:17:44 +01:00
|
|
|
|
|
|
|
pub fn is_failure_note(&self) -> bool {
|
2020-10-26 21:02:48 -04:00
|
|
|
matches!(*self, FailureNote)
|
2018-02-28 16:17:44 +01:00
|
|
|
}
|
2021-11-20 20:45:27 +01:00
|
|
|
|
|
|
|
pub fn get_expectation_id(&self) -> Option<LintExpectationId> {
|
|
|
|
match self {
|
2024-01-09 12:28:45 +11:00
|
|
|
Expect(id) | ForceWarning(Some(id)) => Some(*id),
|
2021-11-20 20:45:27 +01:00
|
|
|
_ => None,
|
|
|
|
}
|
|
|
|
}
|
2024-01-31 11:23:54 +11:00
|
|
|
|
|
|
|
// Can this level be used in a top-level diagnostic message and/or a
|
|
|
|
// subdiagnostic message?
|
|
|
|
fn can_be_top_or_sub(&self) -> (bool, bool) {
|
|
|
|
match self {
|
2024-02-12 16:48:45 +11:00
|
|
|
Bug | DelayedBug | Fatal | Error | ForceWarning(_) | FailureNote | Allow
|
|
|
|
| Expect(_) => (true, false),
|
2024-01-31 11:23:54 +11:00
|
|
|
|
|
|
|
Warning | Note | Help => (true, true),
|
|
|
|
|
|
|
|
OnceNote | OnceHelp => (false, true),
|
|
|
|
}
|
|
|
|
}
|
2015-12-15 14:11:27 +13:00
|
|
|
}
|
2019-09-08 14:57:03 +05:30
|
|
|
|
2022-01-23 20:41:46 +00:00
|
|
|
// FIXME(eddyb) this doesn't belong here AFAICT, should be moved to callsite.
|
2024-02-01 10:13:24 +11:00
|
|
|
pub fn add_elided_lifetime_in_path_suggestion<G: EmissionGuarantee>(
|
2020-08-13 15:41:52 -04:00
|
|
|
source_map: &SourceMap,
|
2024-02-01 10:13:24 +11:00
|
|
|
diag: &mut DiagnosticBuilder<'_, G>,
|
2020-08-13 15:41:52 -04:00
|
|
|
n: usize,
|
|
|
|
path_span: Span,
|
|
|
|
incl_angl_brckt: bool,
|
|
|
|
insertion_span: Span,
|
|
|
|
) {
|
2024-02-14 14:17:27 +00:00
|
|
|
diag.subdiagnostic(diag.dcx, ExpectedLifetimeParameter { span: path_span, count: n });
|
2022-07-11 16:51:19 +09:00
|
|
|
if !source_map.is_span_accessible(insertion_span) {
|
2022-03-10 23:12:35 +01:00
|
|
|
// Do not try to suggest anything if generated by a proc-macro.
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
let anon_lts = vec!["'_"; n].join(", ");
|
|
|
|
let suggestion =
|
2023-07-25 22:00:13 +02:00
|
|
|
if incl_angl_brckt { format!("<{anon_lts}>") } else { format!("{anon_lts}, ") };
|
2023-07-03 18:08:49 +09:00
|
|
|
|
2024-02-14 14:17:27 +00:00
|
|
|
diag.subdiagnostic(
|
|
|
|
diag.dcx,
|
|
|
|
IndicateAnonymousLifetime { span: insertion_span.shrink_to_hi(), count: n, suggestion },
|
|
|
|
);
|
2019-09-08 14:57:03 +05:30
|
|
|
}
|
2019-11-24 16:59:56 -05:00
|
|
|
|
2023-07-26 22:46:49 +08:00
|
|
|
pub fn report_ambiguity_error<'a, G: EmissionGuarantee>(
|
|
|
|
db: &mut DiagnosticBuilder<'a, G>,
|
|
|
|
ambiguity: rustc_lint_defs::AmbiguityErrorDiag,
|
|
|
|
) {
|
|
|
|
db.span_label(ambiguity.label_span, ambiguity.label_msg);
|
|
|
|
db.note(ambiguity.note_msg);
|
|
|
|
db.span_note(ambiguity.b1_span, ambiguity.b1_note_msg);
|
|
|
|
for help_msg in ambiguity.b1_help_msgs {
|
|
|
|
db.help(help_msg);
|
|
|
|
}
|
|
|
|
db.span_note(ambiguity.b2_span, ambiguity.b2_note_msg);
|
|
|
|
for help_msg in ambiguity.b2_help_msgs {
|
|
|
|
db.help(help_msg);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-02-09 10:16:00 +00:00
|
|
|
#[derive(Clone, Copy, PartialEq, Hash, Debug)]
|
|
|
|
pub enum TerminalUrl {
|
|
|
|
No,
|
|
|
|
Yes,
|
|
|
|
Auto,
|
|
|
|
}
|