2019-12-22 22:42:04 +00:00
|
|
|
use crate::snippet::Style;
|
|
|
|
use crate::CodeSuggestion;
|
2019-02-06 18:53:01 +00:00
|
|
|
use crate::Level;
|
2019-12-22 22:42:04 +00:00
|
|
|
use crate::Substitution;
|
|
|
|
use crate::SubstitutionPart;
|
|
|
|
use crate::SuggestionStyle;
|
2020-05-25 23:21:25 +00:00
|
|
|
use crate::ToolMetadata;
|
2022-03-05 20:54:49 +00:00
|
|
|
use rustc_data_structures::stable_map::FxHashMap;
|
|
|
|
use rustc_lint_defs::{Applicability, LintExpectationId};
|
2020-05-25 23:21:25 +00:00
|
|
|
use rustc_serialize::json::Json;
|
2022-03-07 17:50:47 +00:00
|
|
|
use rustc_span::edition::LATEST_STABLE_EDITION;
|
2019-12-31 17:15:40 +00:00
|
|
|
use rustc_span::{MultiSpan, Span, DUMMY_SP};
|
2016-10-11 16:26:32 +00:00
|
|
|
use std::fmt;
|
2021-09-04 11:26:25 +00:00
|
|
|
use std::hash::{Hash, Hasher};
|
2016-10-11 16:26:32 +00:00
|
|
|
|
2022-01-24 09:19:33 +00:00
|
|
|
/// Error type for `Diagnostic`'s `suggestions` field, indicating that
|
|
|
|
/// `.disable_suggestions()` was called on the `Diagnostic`.
|
|
|
|
#[derive(Clone, Debug, PartialEq, Eq, Hash, Encodable, Decodable)]
|
|
|
|
pub struct SuggestionsDisabled;
|
|
|
|
|
2016-10-11 16:26:32 +00:00
|
|
|
#[must_use]
|
2021-09-04 11:26:25 +00:00
|
|
|
#[derive(Clone, Debug, Encodable, Decodable)]
|
2016-10-11 16:26:32 +00:00
|
|
|
pub struct Diagnostic {
|
2022-01-23 23:11:37 +00:00
|
|
|
// NOTE(eddyb) this is private to disallow arbitrary after-the-fact changes,
|
|
|
|
// outside of what methods in this crate themselves allow.
|
|
|
|
crate level: Level,
|
|
|
|
|
2017-01-11 21:55:41 +00:00
|
|
|
pub message: Vec<(String, Style)>,
|
2017-10-27 06:21:22 +00:00
|
|
|
pub code: Option<DiagnosticId>,
|
2016-10-11 16:26:32 +00:00
|
|
|
pub span: MultiSpan,
|
|
|
|
pub children: Vec<SubDiagnostic>,
|
2022-01-24 09:19:33 +00:00
|
|
|
pub suggestions: Result<Vec<CodeSuggestion>, SuggestionsDisabled>,
|
2018-11-28 21:05:36 +00:00
|
|
|
|
|
|
|
/// This is not used for highlighting or rendering any error message. Rather, it can be used
|
|
|
|
/// as a sort key to sort a buffer of diagnostics. By default, it is the primary span of
|
|
|
|
/// `span` if there is one. Otherwise, it is `DUMMY_SP`.
|
|
|
|
pub sort_span: Span,
|
2021-09-04 11:26:25 +00:00
|
|
|
|
|
|
|
/// If diagnostic is from Lint, custom hash function ignores notes
|
|
|
|
/// otherwise hash is based on the all the fields
|
|
|
|
pub is_lint: bool,
|
2016-10-11 16:26:32 +00:00
|
|
|
}
|
|
|
|
|
2020-06-11 14:49:57 +00:00
|
|
|
#[derive(Clone, Debug, PartialEq, Eq, Hash, Encodable, Decodable)]
|
2017-10-27 06:21:22 +00:00
|
|
|
pub enum DiagnosticId {
|
|
|
|
Error(String),
|
2021-06-04 12:37:20 +00:00
|
|
|
Lint { name: String, has_future_breakage: bool, is_force_warn: bool },
|
2017-10-27 06:21:22 +00:00
|
|
|
}
|
|
|
|
|
2020-12-15 04:03:19 +00:00
|
|
|
/// A "sub"-diagnostic attached to a parent diagnostic.
|
|
|
|
/// For example, a note attached to an error.
|
2020-06-11 14:49:57 +00:00
|
|
|
#[derive(Clone, Debug, PartialEq, Hash, Encodable, Decodable)]
|
2016-10-11 16:26:32 +00:00
|
|
|
pub struct SubDiagnostic {
|
|
|
|
pub level: Level,
|
2017-01-11 21:55:41 +00:00
|
|
|
pub message: Vec<(String, Style)>,
|
2016-10-11 16:26:32 +00:00
|
|
|
pub span: MultiSpan,
|
2017-11-16 15:36:49 +00:00
|
|
|
pub render_span: Option<MultiSpan>,
|
2016-10-11 16:26:32 +00:00
|
|
|
}
|
|
|
|
|
2019-10-17 19:07:37 +00:00
|
|
|
#[derive(Debug, PartialEq, Eq)]
|
Highlight and simplify mismatched types
Shorten mismatched types errors by replacing subtypes that are not
different with `_`, and highlighting only the subtypes that are
different.
Given a file
```rust
struct X<T1, T2> {
x: T1,
y: T2,
}
fn foo() -> X<X<String, String>, String> {
X { x: X {x: "".to_string(), y: 2}, y: "".to_string()}
}
fn bar() -> Option<String> {
"".to_string()
}
```
provide the following output
```rust
error[E0308]: mismatched types
--> file.rs:6:5
|
6 | X { x: X {x: "".to_string(), y: 2}, y: "".to_string()}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected struct `std::string::String`, found {integer}
|
= note: expected type `X<X<_, std::string::String>, _>`
^^^^^^^^^^^^^^^^^^^ // < highlighted
found type `X<X<_, {integer}>, _>`
^^^^^^^^^ // < highlighted
error[E0308]: mismatched types
--> file.rs:6:5
|
10 | "".to_string()
| ^^^^^^^^^^^^^^ expected struct `std::option::Option`, found `std::string::String`
|
= note: expected type `Option<std::string::String>`
^^^^^^^ ^ // < highlighted
found type `std::string::String`
```
2017-02-17 22:31:59 +00:00
|
|
|
pub struct DiagnosticStyledString(pub Vec<StringPart>);
|
|
|
|
|
|
|
|
impl DiagnosticStyledString {
|
|
|
|
pub fn new() -> DiagnosticStyledString {
|
|
|
|
DiagnosticStyledString(vec![])
|
|
|
|
}
|
|
|
|
pub fn push_normal<S: Into<String>>(&mut self, t: S) {
|
|
|
|
self.0.push(StringPart::Normal(t.into()));
|
|
|
|
}
|
|
|
|
pub fn push_highlighted<S: Into<String>>(&mut self, t: S) {
|
|
|
|
self.0.push(StringPart::Highlighted(t.into()));
|
|
|
|
}
|
2019-11-24 00:01:20 +00:00
|
|
|
pub fn push<S: Into<String>>(&mut self, t: S, highlight: bool) {
|
|
|
|
if highlight {
|
2019-11-24 02:36:33 +00:00
|
|
|
self.push_highlighted(t);
|
2019-11-24 00:01:20 +00:00
|
|
|
} else {
|
2019-11-24 02:36:33 +00:00
|
|
|
self.push_normal(t);
|
2019-11-24 00:01:20 +00:00
|
|
|
}
|
|
|
|
}
|
Highlight and simplify mismatched types
Shorten mismatched types errors by replacing subtypes that are not
different with `_`, and highlighting only the subtypes that are
different.
Given a file
```rust
struct X<T1, T2> {
x: T1,
y: T2,
}
fn foo() -> X<X<String, String>, String> {
X { x: X {x: "".to_string(), y: 2}, y: "".to_string()}
}
fn bar() -> Option<String> {
"".to_string()
}
```
provide the following output
```rust
error[E0308]: mismatched types
--> file.rs:6:5
|
6 | X { x: X {x: "".to_string(), y: 2}, y: "".to_string()}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected struct `std::string::String`, found {integer}
|
= note: expected type `X<X<_, std::string::String>, _>`
^^^^^^^^^^^^^^^^^^^ // < highlighted
found type `X<X<_, {integer}>, _>`
^^^^^^^^^ // < highlighted
error[E0308]: mismatched types
--> file.rs:6:5
|
10 | "".to_string()
| ^^^^^^^^^^^^^^ expected struct `std::option::Option`, found `std::string::String`
|
= note: expected type `Option<std::string::String>`
^^^^^^^ ^ // < highlighted
found type `std::string::String`
```
2017-02-17 22:31:59 +00:00
|
|
|
pub fn normal<S: Into<String>>(t: S) -> DiagnosticStyledString {
|
|
|
|
DiagnosticStyledString(vec![StringPart::Normal(t.into())])
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn highlighted<S: Into<String>>(t: S) -> DiagnosticStyledString {
|
|
|
|
DiagnosticStyledString(vec![StringPart::Highlighted(t.into())])
|
|
|
|
}
|
2021-06-16 21:35:42 +00:00
|
|
|
|
|
|
|
pub fn content(&self) -> String {
|
|
|
|
self.0.iter().map(|x| x.content()).collect::<String>()
|
|
|
|
}
|
Highlight and simplify mismatched types
Shorten mismatched types errors by replacing subtypes that are not
different with `_`, and highlighting only the subtypes that are
different.
Given a file
```rust
struct X<T1, T2> {
x: T1,
y: T2,
}
fn foo() -> X<X<String, String>, String> {
X { x: X {x: "".to_string(), y: 2}, y: "".to_string()}
}
fn bar() -> Option<String> {
"".to_string()
}
```
provide the following output
```rust
error[E0308]: mismatched types
--> file.rs:6:5
|
6 | X { x: X {x: "".to_string(), y: 2}, y: "".to_string()}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected struct `std::string::String`, found {integer}
|
= note: expected type `X<X<_, std::string::String>, _>`
^^^^^^^^^^^^^^^^^^^ // < highlighted
found type `X<X<_, {integer}>, _>`
^^^^^^^^^ // < highlighted
error[E0308]: mismatched types
--> file.rs:6:5
|
10 | "".to_string()
| ^^^^^^^^^^^^^^ expected struct `std::option::Option`, found `std::string::String`
|
= note: expected type `Option<std::string::String>`
^^^^^^^ ^ // < highlighted
found type `std::string::String`
```
2017-02-17 22:31:59 +00:00
|
|
|
}
|
|
|
|
|
2019-10-17 19:07:37 +00:00
|
|
|
#[derive(Debug, PartialEq, Eq)]
|
Highlight and simplify mismatched types
Shorten mismatched types errors by replacing subtypes that are not
different with `_`, and highlighting only the subtypes that are
different.
Given a file
```rust
struct X<T1, T2> {
x: T1,
y: T2,
}
fn foo() -> X<X<String, String>, String> {
X { x: X {x: "".to_string(), y: 2}, y: "".to_string()}
}
fn bar() -> Option<String> {
"".to_string()
}
```
provide the following output
```rust
error[E0308]: mismatched types
--> file.rs:6:5
|
6 | X { x: X {x: "".to_string(), y: 2}, y: "".to_string()}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected struct `std::string::String`, found {integer}
|
= note: expected type `X<X<_, std::string::String>, _>`
^^^^^^^^^^^^^^^^^^^ // < highlighted
found type `X<X<_, {integer}>, _>`
^^^^^^^^^ // < highlighted
error[E0308]: mismatched types
--> file.rs:6:5
|
10 | "".to_string()
| ^^^^^^^^^^^^^^ expected struct `std::option::Option`, found `std::string::String`
|
= note: expected type `Option<std::string::String>`
^^^^^^^ ^ // < highlighted
found type `std::string::String`
```
2017-02-17 22:31:59 +00:00
|
|
|
pub enum StringPart {
|
|
|
|
Normal(String),
|
|
|
|
Highlighted(String),
|
|
|
|
}
|
|
|
|
|
2021-06-16 21:35:42 +00:00
|
|
|
impl StringPart {
|
|
|
|
pub fn content(&self) -> &str {
|
|
|
|
match self {
|
|
|
|
&StringPart::Normal(ref s) | &StringPart::Highlighted(ref s) => s,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-10-11 16:26:32 +00:00
|
|
|
impl Diagnostic {
|
|
|
|
pub fn new(level: Level, message: &str) -> Self {
|
|
|
|
Diagnostic::new_with_code(level, None, message)
|
|
|
|
}
|
|
|
|
|
2017-10-27 06:21:22 +00:00
|
|
|
pub fn new_with_code(level: Level, code: Option<DiagnosticId>, message: &str) -> Self {
|
2016-10-11 16:26:32 +00:00
|
|
|
Diagnostic {
|
2017-08-07 05:54:09 +00:00
|
|
|
level,
|
2017-01-11 21:55:41 +00:00
|
|
|
message: vec![(message.to_owned(), Style::NoStyle)],
|
2017-08-07 05:54:09 +00:00
|
|
|
code,
|
2016-10-11 16:26:32 +00:00
|
|
|
span: MultiSpan::new(),
|
|
|
|
children: vec![],
|
2022-01-24 09:19:33 +00:00
|
|
|
suggestions: Ok(vec![]),
|
2018-11-28 21:05:36 +00:00
|
|
|
sort_span: DUMMY_SP,
|
2021-09-04 11:26:25 +00:00
|
|
|
is_lint: false,
|
2016-10-11 16:26:32 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-01-23 23:11:37 +00:00
|
|
|
#[inline(always)]
|
|
|
|
pub fn level(&self) -> Level {
|
|
|
|
self.level
|
|
|
|
}
|
|
|
|
|
2018-07-20 15:29:29 +00:00
|
|
|
pub fn is_error(&self) -> bool {
|
|
|
|
match self.level {
|
2022-01-23 23:11:37 +00:00
|
|
|
Level::Bug
|
|
|
|
| Level::DelayedBug
|
|
|
|
| Level::Fatal
|
|
|
|
| Level::Error { .. }
|
|
|
|
| Level::FailureNote => true,
|
2018-07-20 15:29:29 +00:00
|
|
|
|
2022-03-20 19:02:18 +00:00
|
|
|
Level::Warning
|
|
|
|
| Level::Note
|
|
|
|
| Level::OnceNote
|
|
|
|
| Level::Help
|
|
|
|
| Level::Allow
|
|
|
|
| Level::Expect(_) => false,
|
2020-08-13 19:41:52 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-03-05 20:54:49 +00:00
|
|
|
pub fn update_unstable_expectation_id(
|
|
|
|
&mut self,
|
|
|
|
unstable_to_stable: &FxHashMap<LintExpectationId, LintExpectationId>,
|
|
|
|
) {
|
|
|
|
if let Level::Expect(expectation_id) = &mut self.level {
|
|
|
|
if expectation_id.is_stable() {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// The unstable to stable map only maps the unstable `AttrId` to a stable `HirId` with an attribute index.
|
|
|
|
// The lint index inside the attribute is manually transferred here.
|
|
|
|
let lint_index = expectation_id.get_lint_index();
|
|
|
|
expectation_id.set_lint_index(None);
|
|
|
|
let mut stable_id = *unstable_to_stable
|
|
|
|
.get(&expectation_id)
|
|
|
|
.expect("each unstable `LintExpectationId` must have a matching stable id");
|
|
|
|
|
|
|
|
stable_id.set_lint_index(lint_index);
|
|
|
|
*expectation_id = stable_id;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-08-13 19:41:52 +00:00
|
|
|
pub fn has_future_breakage(&self) -> bool {
|
|
|
|
match self.code {
|
|
|
|
Some(DiagnosticId::Lint { has_future_breakage, .. }) => has_future_breakage,
|
|
|
|
_ => false,
|
2018-07-20 15:29:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-06-04 12:37:20 +00:00
|
|
|
pub fn is_force_warn(&self) -> bool {
|
|
|
|
match self.code {
|
|
|
|
Some(DiagnosticId::Lint { is_force_warn, .. }) => is_force_warn,
|
|
|
|
_ => false,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-01-23 23:11:37 +00:00
|
|
|
/// Delay emission of this diagnostic as a bug.
|
|
|
|
///
|
|
|
|
/// This can be useful in contexts where an error indicates a bug but
|
|
|
|
/// typically this only happens when other compilation errors have already
|
|
|
|
/// happened. In those cases this can be used to defer emission of this
|
|
|
|
/// diagnostic as a bug in the compiler only if no other errors have been
|
|
|
|
/// emitted.
|
|
|
|
///
|
|
|
|
/// In the meantime, though, callsites are required to deal with the "bug"
|
|
|
|
/// locally in whichever way makes the most sense.
|
|
|
|
#[track_caller]
|
|
|
|
pub fn downgrade_to_delayed_bug(&mut self) -> &mut Self {
|
2022-01-26 03:39:14 +00:00
|
|
|
assert!(
|
|
|
|
self.is_error(),
|
|
|
|
"downgrade_to_delayed_bug: cannot downgrade {:?} to DelayedBug: not an error",
|
|
|
|
self.level
|
|
|
|
);
|
|
|
|
self.level = Level::DelayedBug;
|
2022-01-23 23:11:37 +00:00
|
|
|
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2019-02-08 13:53:55 +00:00
|
|
|
/// Adds a span/label to be included in the resulting snippet.
|
2019-08-12 08:53:09 +00:00
|
|
|
///
|
2020-08-11 07:42:25 +00:00
|
|
|
/// This is pushed onto the [`MultiSpan`] that was created when the diagnostic
|
|
|
|
/// was first built. That means it will be shown together with the original
|
|
|
|
/// span/label, *not* a span added by one of the `span_{note,warn,help,suggestions}` methods.
|
|
|
|
///
|
|
|
|
/// This span is *not* considered a ["primary span"][`MultiSpan`]; only
|
|
|
|
/// the `Span` supplied when creating the diagnostic is primary.
|
2017-05-04 12:17:23 +00:00
|
|
|
pub fn span_label<T: Into<String>>(&mut self, span: Span, label: T) -> &mut Self {
|
|
|
|
self.span.push_span_label(span, label.into());
|
2016-10-11 16:26:32 +00:00
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2022-01-23 20:41:46 +00:00
|
|
|
/// Labels all the given spans with the provided label.
|
|
|
|
/// See [`Self::span_label()`] for more information.
|
|
|
|
pub fn span_labels(
|
|
|
|
&mut self,
|
|
|
|
spans: impl IntoIterator<Item = Span>,
|
|
|
|
label: impl AsRef<str>,
|
|
|
|
) -> &mut Self {
|
|
|
|
let label = label.as_ref();
|
|
|
|
for span in spans {
|
|
|
|
self.span_label(span, label);
|
|
|
|
}
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2018-11-06 00:27:28 +00:00
|
|
|
pub fn replace_span_with(&mut self, after: Span) -> &mut Self {
|
|
|
|
let before = self.span.clone();
|
|
|
|
self.set_span(after);
|
|
|
|
for span_label in before.span_labels() {
|
|
|
|
if let Some(label) = span_label.label {
|
|
|
|
self.span_label(after, label);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2022-01-23 20:41:46 +00:00
|
|
|
pub fn note_expected_found(
|
2019-11-13 22:16:56 +00:00
|
|
|
&mut self,
|
|
|
|
expected_label: &dyn fmt::Display,
|
|
|
|
expected: DiagnosticStyledString,
|
|
|
|
found_label: &dyn fmt::Display,
|
|
|
|
found: DiagnosticStyledString,
|
|
|
|
) -> &mut Self {
|
|
|
|
self.note_expected_found_extra(expected_label, expected, found_label, found, &"", &"")
|
|
|
|
}
|
|
|
|
|
2022-01-23 20:41:46 +00:00
|
|
|
pub fn note_unsuccessful_coercion(
|
2019-11-13 22:16:56 +00:00
|
|
|
&mut self,
|
|
|
|
expected: DiagnosticStyledString,
|
|
|
|
found: DiagnosticStyledString,
|
|
|
|
) -> &mut Self {
|
2019-01-08 21:14:04 +00:00
|
|
|
let mut msg: Vec<_> =
|
2020-02-28 23:35:24 +00:00
|
|
|
vec![("required when trying to coerce from type `".to_string(), Style::NoStyle)];
|
2019-12-22 22:42:04 +00:00
|
|
|
msg.extend(expected.0.iter().map(|x| match *x {
|
|
|
|
StringPart::Normal(ref s) => (s.to_owned(), Style::NoStyle),
|
|
|
|
StringPart::Highlighted(ref s) => (s.to_owned(), Style::Highlight),
|
|
|
|
}));
|
2020-02-28 23:35:24 +00:00
|
|
|
msg.push(("` to type '".to_string(), Style::NoStyle));
|
2019-12-22 22:42:04 +00:00
|
|
|
msg.extend(found.0.iter().map(|x| match *x {
|
|
|
|
StringPart::Normal(ref s) => (s.to_owned(), Style::NoStyle),
|
|
|
|
StringPart::Highlighted(ref s) => (s.to_owned(), Style::Highlight),
|
|
|
|
}));
|
2020-02-28 23:35:24 +00:00
|
|
|
msg.push(("`".to_string(), Style::NoStyle));
|
2019-01-08 21:14:04 +00:00
|
|
|
|
|
|
|
// For now, just attach these as notes
|
|
|
|
self.highlighted_note(msg);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2019-11-13 22:16:56 +00:00
|
|
|
pub fn note_expected_found_extra(
|
|
|
|
&mut self,
|
|
|
|
expected_label: &dyn fmt::Display,
|
|
|
|
expected: DiagnosticStyledString,
|
|
|
|
found_label: &dyn fmt::Display,
|
|
|
|
found: DiagnosticStyledString,
|
|
|
|
expected_extra: &dyn fmt::Display,
|
|
|
|
found_extra: &dyn fmt::Display,
|
|
|
|
) -> &mut Self {
|
2019-12-20 03:44:06 +00:00
|
|
|
let expected_label = expected_label.to_string();
|
|
|
|
let expected_label = if expected_label.is_empty() {
|
|
|
|
"expected".to_string()
|
|
|
|
} else {
|
|
|
|
format!("expected {}", expected_label)
|
|
|
|
};
|
|
|
|
let found_label = found_label.to_string();
|
|
|
|
let found_label = if found_label.is_empty() {
|
|
|
|
"found".to_string()
|
|
|
|
} else {
|
|
|
|
format!("found {}", found_label)
|
|
|
|
};
|
2019-11-13 22:16:56 +00:00
|
|
|
let (found_padding, expected_padding) = if expected_label.len() > found_label.len() {
|
|
|
|
(expected_label.len() - found_label.len(), 0)
|
|
|
|
} else {
|
|
|
|
(0, found_label.len() - expected_label.len())
|
|
|
|
};
|
2019-12-22 22:42:04 +00:00
|
|
|
let mut msg: Vec<_> =
|
|
|
|
vec![(format!("{}{} `", " ".repeat(expected_padding), expected_label), Style::NoStyle)];
|
|
|
|
msg.extend(expected.0.iter().map(|x| match *x {
|
|
|
|
StringPart::Normal(ref s) => (s.to_owned(), Style::NoStyle),
|
|
|
|
StringPart::Highlighted(ref s) => (s.to_owned(), Style::Highlight),
|
|
|
|
}));
|
Highlight and simplify mismatched types
Shorten mismatched types errors by replacing subtypes that are not
different with `_`, and highlighting only the subtypes that are
different.
Given a file
```rust
struct X<T1, T2> {
x: T1,
y: T2,
}
fn foo() -> X<X<String, String>, String> {
X { x: X {x: "".to_string(), y: 2}, y: "".to_string()}
}
fn bar() -> Option<String> {
"".to_string()
}
```
provide the following output
```rust
error[E0308]: mismatched types
--> file.rs:6:5
|
6 | X { x: X {x: "".to_string(), y: 2}, y: "".to_string()}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected struct `std::string::String`, found {integer}
|
= note: expected type `X<X<_, std::string::String>, _>`
^^^^^^^^^^^^^^^^^^^ // < highlighted
found type `X<X<_, {integer}>, _>`
^^^^^^^^^ // < highlighted
error[E0308]: mismatched types
--> file.rs:6:5
|
10 | "".to_string()
| ^^^^^^^^^^^^^^ expected struct `std::option::Option`, found `std::string::String`
|
= note: expected type `Option<std::string::String>`
^^^^^^^ ^ // < highlighted
found type `std::string::String`
```
2017-02-17 22:31:59 +00:00
|
|
|
msg.push((format!("`{}\n", expected_extra), Style::NoStyle));
|
2019-11-13 22:16:56 +00:00
|
|
|
msg.push((format!("{}{} `", " ".repeat(found_padding), found_label), Style::NoStyle));
|
2019-12-22 22:42:04 +00:00
|
|
|
msg.extend(found.0.iter().map(|x| match *x {
|
|
|
|
StringPart::Normal(ref s) => (s.to_owned(), Style::NoStyle),
|
|
|
|
StringPart::Highlighted(ref s) => (s.to_owned(), Style::Highlight),
|
|
|
|
}));
|
Highlight and simplify mismatched types
Shorten mismatched types errors by replacing subtypes that are not
different with `_`, and highlighting only the subtypes that are
different.
Given a file
```rust
struct X<T1, T2> {
x: T1,
y: T2,
}
fn foo() -> X<X<String, String>, String> {
X { x: X {x: "".to_string(), y: 2}, y: "".to_string()}
}
fn bar() -> Option<String> {
"".to_string()
}
```
provide the following output
```rust
error[E0308]: mismatched types
--> file.rs:6:5
|
6 | X { x: X {x: "".to_string(), y: 2}, y: "".to_string()}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected struct `std::string::String`, found {integer}
|
= note: expected type `X<X<_, std::string::String>, _>`
^^^^^^^^^^^^^^^^^^^ // < highlighted
found type `X<X<_, {integer}>, _>`
^^^^^^^^^ // < highlighted
error[E0308]: mismatched types
--> file.rs:6:5
|
10 | "".to_string()
| ^^^^^^^^^^^^^^ expected struct `std::option::Option`, found `std::string::String`
|
= note: expected type `Option<std::string::String>`
^^^^^^^ ^ // < highlighted
found type `std::string::String`
```
2017-02-17 22:31:59 +00:00
|
|
|
msg.push((format!("`{}", found_extra), Style::NoStyle));
|
|
|
|
|
2019-05-17 01:20:14 +00:00
|
|
|
// For now, just attach these as notes.
|
Highlight and simplify mismatched types
Shorten mismatched types errors by replacing subtypes that are not
different with `_`, and highlighting only the subtypes that are
different.
Given a file
```rust
struct X<T1, T2> {
x: T1,
y: T2,
}
fn foo() -> X<X<String, String>, String> {
X { x: X {x: "".to_string(), y: 2}, y: "".to_string()}
}
fn bar() -> Option<String> {
"".to_string()
}
```
provide the following output
```rust
error[E0308]: mismatched types
--> file.rs:6:5
|
6 | X { x: X {x: "".to_string(), y: 2}, y: "".to_string()}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected struct `std::string::String`, found {integer}
|
= note: expected type `X<X<_, std::string::String>, _>`
^^^^^^^^^^^^^^^^^^^ // < highlighted
found type `X<X<_, {integer}>, _>`
^^^^^^^^^ // < highlighted
error[E0308]: mismatched types
--> file.rs:6:5
|
10 | "".to_string()
| ^^^^^^^^^^^^^^ expected struct `std::option::Option`, found `std::string::String`
|
= note: expected type `Option<std::string::String>`
^^^^^^^ ^ // < highlighted
found type `std::string::String`
```
2017-02-17 22:31:59 +00:00
|
|
|
self.highlighted_note(msg);
|
2016-10-11 16:26:32 +00:00
|
|
|
self
|
|
|
|
}
|
|
|
|
|
Show trait method signature when impl differs
When the trait's span is available, it is already being used, add a
`note` for the cases where the span isn't available:
```
error[E0053]: method `fmt` has an incompatible type for trait
--> $DIR/trait_type.rs:17:4
|
17 | fn fmt(&self, x: &str) -> () { }
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ types differ in mutability
|
= note: expected type `fn(&MyType, &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error>`
found type `fn(&MyType, &str)`
error[E0050]: method `fmt` has 1 parameter but the declaration in trait `std::fmt::Display::fmt` has 2
--> $DIR/trait_type.rs:21:11
|
21 | fn fmt(&self) -> () { }
| ^^^^^ expected 2 parameters, found 1
|
= note: `fmt` from trait: `fn(&Self, &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error>`
error[E0186]: method `fmt` has a `&self` declaration in the trait, but not in the impl
--> $DIR/trait_type.rs:25:4
|
25 | fn fmt() -> () { }
| ^^^^^^^^^^^^^^^^^^ expected `&self` in impl
|
= note: `fmt` from trait: `fn(&Self, &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error>`
error[E0046]: not all trait items implemented, missing: `fmt`
--> $DIR/trait_type.rs:28:1
|
28 | impl std::fmt::Display for MyType4 {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `fmt` in implementation
|
= note: `fmt` from trait: `fn(&Self, &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error>`
```
2017-06-01 06:14:43 +00:00
|
|
|
pub fn note_trait_signature(&mut self, name: String, signature: String) -> &mut Self {
|
|
|
|
self.highlighted_note(vec![
|
|
|
|
(format!("`{}` from trait: `", name), Style::NoStyle),
|
|
|
|
(signature, Style::Highlight),
|
2019-12-22 22:42:04 +00:00
|
|
|
("`".to_string(), Style::NoStyle),
|
|
|
|
]);
|
Show trait method signature when impl differs
When the trait's span is available, it is already being used, add a
`note` for the cases where the span isn't available:
```
error[E0053]: method `fmt` has an incompatible type for trait
--> $DIR/trait_type.rs:17:4
|
17 | fn fmt(&self, x: &str) -> () { }
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ types differ in mutability
|
= note: expected type `fn(&MyType, &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error>`
found type `fn(&MyType, &str)`
error[E0050]: method `fmt` has 1 parameter but the declaration in trait `std::fmt::Display::fmt` has 2
--> $DIR/trait_type.rs:21:11
|
21 | fn fmt(&self) -> () { }
| ^^^^^ expected 2 parameters, found 1
|
= note: `fmt` from trait: `fn(&Self, &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error>`
error[E0186]: method `fmt` has a `&self` declaration in the trait, but not in the impl
--> $DIR/trait_type.rs:25:4
|
25 | fn fmt() -> () { }
| ^^^^^^^^^^^^^^^^^^ expected `&self` in impl
|
= note: `fmt` from trait: `fn(&Self, &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error>`
error[E0046]: not all trait items implemented, missing: `fmt`
--> $DIR/trait_type.rs:28:1
|
28 | impl std::fmt::Display for MyType4 {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `fmt` in implementation
|
= note: `fmt` from trait: `fn(&Self, &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error>`
```
2017-06-01 06:14:43 +00:00
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2020-12-15 04:03:19 +00:00
|
|
|
/// Add a note attached to this diagnostic.
|
2016-10-11 16:26:32 +00:00
|
|
|
pub fn note(&mut self, msg: &str) -> &mut Self {
|
|
|
|
self.sub(Level::Note, msg, MultiSpan::new(), None);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2017-01-11 21:55:41 +00:00
|
|
|
pub fn highlighted_note(&mut self, msg: Vec<(String, Style)>) -> &mut Self {
|
|
|
|
self.sub_with_highlights(Level::Note, msg, MultiSpan::new(), None);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2022-03-20 19:02:18 +00:00
|
|
|
/// Prints the span with a note above it.
|
|
|
|
/// This is like [`Diagnostic::note()`], but it gets its own span.
|
|
|
|
pub fn note_once(&mut self, msg: &str) -> &mut Self {
|
|
|
|
self.sub(Level::OnceNote, msg, MultiSpan::new(), None);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2019-08-12 08:53:09 +00:00
|
|
|
/// Prints the span with a note above it.
|
2020-12-15 04:03:19 +00:00
|
|
|
/// This is like [`Diagnostic::note()`], but it gets its own span.
|
2022-01-23 20:41:46 +00:00
|
|
|
pub fn span_note<S: Into<MultiSpan>>(&mut self, sp: S, msg: &str) -> &mut Self {
|
2016-10-11 16:26:32 +00:00
|
|
|
self.sub(Level::Note, msg, sp.into(), None);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2022-03-20 19:02:18 +00:00
|
|
|
/// Prints the span with a note above it.
|
|
|
|
/// This is like [`Diagnostic::note()`], but it gets its own span.
|
|
|
|
pub fn span_note_once<S: Into<MultiSpan>>(&mut self, sp: S, msg: &str) -> &mut Self {
|
|
|
|
self.sub(Level::OnceNote, msg, sp.into(), None);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2020-12-15 04:03:19 +00:00
|
|
|
/// Add a warning attached to this diagnostic.
|
2022-01-23 20:41:46 +00:00
|
|
|
pub fn warn(&mut self, msg: &str) -> &mut Self {
|
2016-10-11 16:26:32 +00:00
|
|
|
self.sub(Level::Warning, msg, MultiSpan::new(), None);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2020-12-15 04:03:19 +00:00
|
|
|
/// Prints the span with a warning above it.
|
|
|
|
/// This is like [`Diagnostic::warn()`], but it gets its own span.
|
2022-01-23 20:41:46 +00:00
|
|
|
pub fn span_warn<S: Into<MultiSpan>>(&mut self, sp: S, msg: &str) -> &mut Self {
|
2016-10-11 16:26:32 +00:00
|
|
|
self.sub(Level::Warning, msg, sp.into(), None);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2020-12-15 04:03:19 +00:00
|
|
|
/// Add a help message attached to this diagnostic.
|
2022-01-23 20:41:46 +00:00
|
|
|
pub fn help(&mut self, msg: &str) -> &mut Self {
|
2016-10-11 16:26:32 +00:00
|
|
|
self.sub(Level::Help, msg, MultiSpan::new(), None);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2021-12-13 20:56:40 +00:00
|
|
|
/// Add a help message attached to this diagnostic with a customizable highlighted message.
|
|
|
|
pub fn highlighted_help(&mut self, msg: Vec<(String, Style)>) -> &mut Self {
|
|
|
|
self.sub_with_highlights(Level::Help, msg, MultiSpan::new(), None);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2019-08-12 08:53:09 +00:00
|
|
|
/// Prints the span with some help above it.
|
2020-12-15 04:03:19 +00:00
|
|
|
/// This is like [`Diagnostic::help()`], but it gets its own span.
|
2022-01-23 20:41:46 +00:00
|
|
|
pub fn span_help<S: Into<MultiSpan>>(&mut self, sp: S, msg: &str) -> &mut Self {
|
2016-10-11 16:26:32 +00:00
|
|
|
self.sub(Level::Help, msg, sp.into(), None);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2022-03-07 17:50:47 +00:00
|
|
|
/// Help the user upgrade to the latest edition.
|
|
|
|
/// This is factored out to make sure it does the right thing with `Cargo.toml`.
|
|
|
|
pub fn help_use_latest_edition(&mut self) -> &mut Self {
|
|
|
|
if std::env::var_os("CARGO").is_some() {
|
|
|
|
self.help(&format!("set `edition = \"{}\"` in `Cargo.toml`", LATEST_STABLE_EDITION));
|
|
|
|
} else {
|
|
|
|
self.help(&format!("pass `--edition {}` to `rustc`", LATEST_STABLE_EDITION));
|
|
|
|
}
|
|
|
|
self.note("for more on editions, read https://doc.rust-lang.org/edition-guide");
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2022-01-24 09:19:33 +00:00
|
|
|
/// Disallow attaching suggestions this diagnostic.
|
|
|
|
/// Any suggestions attached e.g. with the `span_suggestion_*` methods
|
|
|
|
/// (before and after the call to `disable_suggestions`) will be ignored.
|
|
|
|
pub fn disable_suggestions(&mut self) -> &mut Self {
|
|
|
|
self.suggestions = Err(SuggestionsDisabled);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Helper for pushing to `self.suggestions`, if available (not disable).
|
|
|
|
fn push_suggestion(&mut self, suggestion: CodeSuggestion) {
|
|
|
|
if let Ok(suggestions) = &mut self.suggestions {
|
|
|
|
suggestions.push(suggestion);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-12-15 04:03:19 +00:00
|
|
|
/// Show a suggestion that has multiple parts to it.
|
|
|
|
/// In other words, multiple changes need to be applied as part of this suggestion.
|
2019-01-25 21:03:27 +00:00
|
|
|
pub fn multipart_suggestion(
|
2018-05-21 16:06:28 +00:00
|
|
|
&mut self,
|
|
|
|
msg: &str,
|
|
|
|
suggestion: Vec<(Span, String)>,
|
2018-09-15 11:44:28 +00:00
|
|
|
applicability: Applicability,
|
2018-05-21 16:06:28 +00:00
|
|
|
) -> &mut Self {
|
2021-05-10 12:59:54 +00:00
|
|
|
self.multipart_suggestion_with_style(
|
|
|
|
msg,
|
|
|
|
suggestion,
|
2018-09-15 11:44:28 +00:00
|
|
|
applicability,
|
2021-05-10 12:59:54 +00:00
|
|
|
SuggestionStyle::ShowCode,
|
|
|
|
)
|
2017-05-09 08:04:24 +00:00
|
|
|
}
|
|
|
|
|
2021-08-10 10:53:43 +00:00
|
|
|
/// Show a suggestion that has multiple parts to it, always as it's own subdiagnostic.
|
|
|
|
/// In other words, multiple changes need to be applied as part of this suggestion.
|
|
|
|
pub fn multipart_suggestion_verbose(
|
|
|
|
&mut self,
|
|
|
|
msg: &str,
|
|
|
|
suggestion: Vec<(Span, String)>,
|
|
|
|
applicability: Applicability,
|
|
|
|
) -> &mut Self {
|
|
|
|
self.multipart_suggestion_with_style(
|
|
|
|
msg,
|
|
|
|
suggestion,
|
|
|
|
applicability,
|
|
|
|
SuggestionStyle::ShowAlways,
|
|
|
|
)
|
|
|
|
}
|
2021-05-07 17:44:32 +00:00
|
|
|
/// [`Diagnostic::multipart_suggestion()`] but you can set the [`SuggestionStyle`].
|
|
|
|
pub fn multipart_suggestion_with_style(
|
|
|
|
&mut self,
|
|
|
|
msg: &str,
|
|
|
|
suggestion: Vec<(Span, String)>,
|
|
|
|
applicability: Applicability,
|
|
|
|
style: SuggestionStyle,
|
|
|
|
) -> &mut Self {
|
|
|
|
assert!(!suggestion.is_empty());
|
2022-01-24 09:19:33 +00:00
|
|
|
self.push_suggestion(CodeSuggestion {
|
2021-05-07 17:44:32 +00:00
|
|
|
substitutions: vec![Substitution {
|
|
|
|
parts: suggestion
|
|
|
|
.into_iter()
|
|
|
|
.map(|(span, snippet)| SubstitutionPart { snippet, span })
|
|
|
|
.collect(),
|
|
|
|
}],
|
|
|
|
msg: msg.to_owned(),
|
|
|
|
style,
|
|
|
|
applicability,
|
|
|
|
tool_metadata: Default::default(),
|
|
|
|
});
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2019-02-11 19:16:22 +00:00
|
|
|
/// Prints out a message with for a multipart suggestion without showing the suggested code.
|
|
|
|
///
|
|
|
|
/// This is intended to be used for suggestions that are obvious in what the changes need to
|
|
|
|
/// be from the message, showing the span label inline would be visually unpleasant
|
|
|
|
/// (marginally overlapping spans or multiline spans) and showing the snippet window wouldn't
|
|
|
|
/// improve understandability.
|
|
|
|
pub fn tool_only_multipart_suggestion(
|
|
|
|
&mut self,
|
|
|
|
msg: &str,
|
|
|
|
suggestion: Vec<(Span, String)>,
|
|
|
|
applicability: Applicability,
|
|
|
|
) -> &mut Self {
|
2021-02-14 03:52:12 +00:00
|
|
|
assert!(!suggestion.is_empty());
|
2022-01-24 09:19:33 +00:00
|
|
|
self.push_suggestion(CodeSuggestion {
|
2019-02-11 19:16:22 +00:00
|
|
|
substitutions: vec![Substitution {
|
|
|
|
parts: suggestion
|
|
|
|
.into_iter()
|
|
|
|
.map(|(span, snippet)| SubstitutionPart { snippet, span })
|
|
|
|
.collect(),
|
|
|
|
}],
|
|
|
|
msg: msg.to_owned(),
|
|
|
|
style: SuggestionStyle::CompletelyHidden,
|
2018-09-15 11:44:28 +00:00
|
|
|
applicability,
|
2020-05-25 23:21:25 +00:00
|
|
|
tool_metadata: Default::default(),
|
2017-05-09 08:04:24 +00:00
|
|
|
});
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2019-01-25 21:03:27 +00:00
|
|
|
/// Prints out a message with a suggested edit of the code.
|
|
|
|
///
|
|
|
|
/// In case of short messages and a simple suggestion, rustc displays it as a label:
|
|
|
|
///
|
|
|
|
/// ```text
|
|
|
|
/// try adding parentheses: `(tup.0).1`
|
|
|
|
/// ```
|
|
|
|
///
|
|
|
|
/// The message
|
|
|
|
///
|
|
|
|
/// * should not end in any punctuation (a `:` is added automatically)
|
|
|
|
/// * should not be a question (avoid language like "did you mean")
|
|
|
|
/// * should not contain any phrases like "the following", "as shown", etc.
|
|
|
|
/// * may look like "to do xyz, use" or "to do xyz, use abc"
|
|
|
|
/// * may contain a name of a function, variable, or type, but not whole expressions
|
|
|
|
///
|
|
|
|
/// See `CodeSuggestion` for more information.
|
2019-10-03 20:22:18 +00:00
|
|
|
pub fn span_suggestion(
|
|
|
|
&mut self,
|
|
|
|
sp: Span,
|
|
|
|
msg: &str,
|
|
|
|
suggestion: String,
|
|
|
|
applicability: Applicability,
|
2019-10-04 02:32:56 +00:00
|
|
|
) -> &mut Self {
|
|
|
|
self.span_suggestion_with_style(
|
|
|
|
sp,
|
|
|
|
msg,
|
|
|
|
suggestion,
|
|
|
|
applicability,
|
|
|
|
SuggestionStyle::ShowCode,
|
|
|
|
);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2020-12-15 04:03:19 +00:00
|
|
|
/// [`Diagnostic::span_suggestion()`] but you can set the [`SuggestionStyle`].
|
2019-10-04 02:32:56 +00:00
|
|
|
pub fn span_suggestion_with_style(
|
|
|
|
&mut self,
|
|
|
|
sp: Span,
|
|
|
|
msg: &str,
|
|
|
|
suggestion: String,
|
|
|
|
applicability: Applicability,
|
|
|
|
style: SuggestionStyle,
|
2019-10-03 20:22:18 +00:00
|
|
|
) -> &mut Self {
|
2022-01-24 09:19:33 +00:00
|
|
|
self.push_suggestion(CodeSuggestion {
|
2018-01-18 11:47:46 +00:00
|
|
|
substitutions: vec![Substitution {
|
2019-12-22 22:42:04 +00:00
|
|
|
parts: vec![SubstitutionPart { snippet: suggestion, span: sp }],
|
2018-01-18 11:47:46 +00:00
|
|
|
}],
|
|
|
|
msg: msg.to_owned(),
|
2019-10-04 02:32:56 +00:00
|
|
|
style,
|
2018-04-25 21:51:06 +00:00
|
|
|
applicability,
|
2020-05-25 23:21:25 +00:00
|
|
|
tool_metadata: Default::default(),
|
2018-01-18 11:47:46 +00:00
|
|
|
});
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2020-12-15 04:03:19 +00:00
|
|
|
/// Always show the suggested change.
|
2019-10-03 20:22:18 +00:00
|
|
|
pub fn span_suggestion_verbose(
|
|
|
|
&mut self,
|
|
|
|
sp: Span,
|
|
|
|
msg: &str,
|
|
|
|
suggestion: String,
|
|
|
|
applicability: Applicability,
|
|
|
|
) -> &mut Self {
|
2019-10-04 02:32:56 +00:00
|
|
|
self.span_suggestion_with_style(
|
|
|
|
sp,
|
|
|
|
msg,
|
|
|
|
suggestion,
|
2019-10-03 20:22:18 +00:00
|
|
|
applicability,
|
2019-10-04 02:32:56 +00:00
|
|
|
SuggestionStyle::ShowAlways,
|
|
|
|
);
|
2019-10-03 20:22:18 +00:00
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2019-01-25 21:03:27 +00:00
|
|
|
/// Prints out a message with multiple suggested edits of the code.
|
2020-12-15 04:03:19 +00:00
|
|
|
/// See also [`Diagnostic::span_suggestion()`].
|
2019-10-03 20:22:18 +00:00
|
|
|
pub fn span_suggestions(
|
|
|
|
&mut self,
|
|
|
|
sp: Span,
|
|
|
|
msg: &str,
|
|
|
|
suggestions: impl Iterator<Item = String>,
|
|
|
|
applicability: Applicability,
|
|
|
|
) -> &mut Self {
|
2021-10-01 18:09:31 +00:00
|
|
|
let mut suggestions: Vec<_> = suggestions.collect();
|
|
|
|
suggestions.sort();
|
|
|
|
let substitutions = suggestions
|
|
|
|
.into_iter()
|
|
|
|
.map(|snippet| Substitution { parts: vec![SubstitutionPart { snippet, span: sp }] })
|
|
|
|
.collect();
|
2022-01-24 09:19:33 +00:00
|
|
|
self.push_suggestion(CodeSuggestion {
|
2021-10-01 18:09:31 +00:00
|
|
|
substitutions,
|
2018-01-18 11:47:46 +00:00
|
|
|
msg: msg.to_owned(),
|
2019-02-08 10:45:53 +00:00
|
|
|
style: SuggestionStyle::ShowCode,
|
2018-04-25 21:51:06 +00:00
|
|
|
applicability,
|
2020-05-25 23:21:25 +00:00
|
|
|
tool_metadata: Default::default(),
|
2017-03-24 16:31:41 +00:00
|
|
|
});
|
2016-10-11 16:26:32 +00:00
|
|
|
self
|
|
|
|
}
|
2018-05-13 03:44:50 +00:00
|
|
|
|
2021-06-28 18:22:47 +00:00
|
|
|
/// Prints out a message with multiple suggested edits of the code.
|
|
|
|
/// See also [`Diagnostic::span_suggestion()`].
|
|
|
|
pub fn multipart_suggestions(
|
|
|
|
&mut self,
|
|
|
|
msg: &str,
|
|
|
|
suggestions: impl Iterator<Item = Vec<(Span, String)>>,
|
|
|
|
applicability: Applicability,
|
|
|
|
) -> &mut Self {
|
2022-01-24 09:19:33 +00:00
|
|
|
self.push_suggestion(CodeSuggestion {
|
2021-06-28 18:22:47 +00:00
|
|
|
substitutions: suggestions
|
|
|
|
.map(|sugg| Substitution {
|
|
|
|
parts: sugg
|
|
|
|
.into_iter()
|
|
|
|
.map(|(span, snippet)| SubstitutionPart { snippet, span })
|
|
|
|
.collect(),
|
|
|
|
})
|
|
|
|
.collect(),
|
|
|
|
msg: msg.to_owned(),
|
|
|
|
style: SuggestionStyle::ShowCode,
|
|
|
|
applicability,
|
|
|
|
tool_metadata: Default::default(),
|
|
|
|
});
|
|
|
|
self
|
|
|
|
}
|
2019-01-25 21:03:27 +00:00
|
|
|
/// Prints out a message with a suggested edit of the code. If the suggestion is presented
|
|
|
|
/// inline, it will only show the message and not the suggestion.
|
|
|
|
///
|
|
|
|
/// See `CodeSuggestion` for more information.
|
|
|
|
pub fn span_suggestion_short(
|
2019-12-22 22:42:04 +00:00
|
|
|
&mut self,
|
|
|
|
sp: Span,
|
|
|
|
msg: &str,
|
|
|
|
suggestion: String,
|
|
|
|
applicability: Applicability,
|
2018-05-13 03:44:50 +00:00
|
|
|
) -> &mut Self {
|
2019-10-04 02:32:56 +00:00
|
|
|
self.span_suggestion_with_style(
|
|
|
|
sp,
|
|
|
|
msg,
|
|
|
|
suggestion,
|
2019-02-11 19:16:22 +00:00
|
|
|
applicability,
|
2019-10-04 02:32:56 +00:00
|
|
|
SuggestionStyle::HideCodeInline,
|
|
|
|
);
|
2018-05-13 03:44:50 +00:00
|
|
|
self
|
2019-02-08 10:50:53 +00:00
|
|
|
}
|
|
|
|
|
2020-12-15 04:03:19 +00:00
|
|
|
/// Prints out a message for a suggestion without showing the suggested code.
|
2019-02-08 10:50:53 +00:00
|
|
|
///
|
|
|
|
/// This is intended to be used for suggestions that are obvious in what the changes need to
|
|
|
|
/// be from the message, showing the span label inline would be visually unpleasant
|
|
|
|
/// (marginally overlapping spans or multiline spans) and showing the snippet window wouldn't
|
|
|
|
/// improve understandability.
|
|
|
|
pub fn span_suggestion_hidden(
|
2019-12-22 22:42:04 +00:00
|
|
|
&mut self,
|
|
|
|
sp: Span,
|
|
|
|
msg: &str,
|
|
|
|
suggestion: String,
|
|
|
|
applicability: Applicability,
|
2019-02-08 10:50:53 +00:00
|
|
|
) -> &mut Self {
|
2019-10-04 02:32:56 +00:00
|
|
|
self.span_suggestion_with_style(
|
|
|
|
sp,
|
|
|
|
msg,
|
|
|
|
suggestion,
|
2019-02-11 19:16:22 +00:00
|
|
|
applicability,
|
2019-10-04 02:32:56 +00:00
|
|
|
SuggestionStyle::HideCodeAlways,
|
|
|
|
);
|
2019-02-08 10:50:53 +00:00
|
|
|
self
|
2019-02-09 11:39:08 +00:00
|
|
|
}
|
|
|
|
|
2020-12-15 04:03:19 +00:00
|
|
|
/// Adds a suggestion to the JSON output that will not be shown in the CLI.
|
2019-02-09 11:39:08 +00:00
|
|
|
///
|
|
|
|
/// This is intended to be used for suggestions that are *very* obvious in what the changes
|
|
|
|
/// need to be from the message, but we still want other tools to be able to apply them.
|
|
|
|
pub fn tool_only_span_suggestion(
|
2019-12-22 22:42:04 +00:00
|
|
|
&mut self,
|
|
|
|
sp: Span,
|
|
|
|
msg: &str,
|
|
|
|
suggestion: String,
|
|
|
|
applicability: Applicability,
|
2019-02-09 11:39:08 +00:00
|
|
|
) -> &mut Self {
|
2019-10-04 02:32:56 +00:00
|
|
|
self.span_suggestion_with_style(
|
|
|
|
sp,
|
|
|
|
msg,
|
|
|
|
suggestion,
|
2019-06-25 21:22:45 +00:00
|
|
|
applicability,
|
2019-10-04 02:32:56 +00:00
|
|
|
SuggestionStyle::CompletelyHidden,
|
|
|
|
);
|
2018-05-13 03:44:50 +00:00
|
|
|
self
|
|
|
|
}
|
2016-10-11 16:26:32 +00:00
|
|
|
|
2020-05-25 23:21:25 +00:00
|
|
|
/// Adds a suggestion intended only for a tool. The intent is that the metadata encodes
|
|
|
|
/// the suggestion in a tool-specific way, as it may not even directly involve Rust code.
|
|
|
|
pub fn tool_only_suggestion_with_metadata(
|
|
|
|
&mut self,
|
|
|
|
msg: &str,
|
|
|
|
applicability: Applicability,
|
|
|
|
tool_metadata: Json,
|
|
|
|
) {
|
2022-01-24 09:19:33 +00:00
|
|
|
self.push_suggestion(CodeSuggestion {
|
2020-05-25 23:21:25 +00:00
|
|
|
substitutions: vec![],
|
|
|
|
msg: msg.to_owned(),
|
|
|
|
style: SuggestionStyle::CompletelyHidden,
|
|
|
|
applicability,
|
|
|
|
tool_metadata: ToolMetadata::new(tool_metadata),
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2016-10-11 16:26:32 +00:00
|
|
|
pub fn set_span<S: Into<MultiSpan>>(&mut self, sp: S) -> &mut Self {
|
|
|
|
self.span = sp.into();
|
2018-11-28 21:05:36 +00:00
|
|
|
if let Some(span) = self.span.primary_span() {
|
|
|
|
self.sort_span = span;
|
|
|
|
}
|
2016-10-11 16:26:32 +00:00
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2021-09-04 11:26:25 +00:00
|
|
|
pub fn set_is_lint(&mut self) -> &mut Self {
|
|
|
|
self.is_lint = true;
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2017-10-27 06:21:22 +00:00
|
|
|
pub fn code(&mut self, s: DiagnosticId) -> &mut Self {
|
2016-10-11 16:26:32 +00:00
|
|
|
self.code = Some(s);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2019-10-06 22:14:34 +00:00
|
|
|
pub fn clear_code(&mut self) -> &mut Self {
|
|
|
|
self.code = None;
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2018-01-22 05:19:37 +00:00
|
|
|
pub fn get_code(&self) -> Option<DiagnosticId> {
|
|
|
|
self.code.clone()
|
|
|
|
}
|
|
|
|
|
2022-01-23 20:41:46 +00:00
|
|
|
pub fn set_primary_message<M: Into<String>>(&mut self, msg: M) -> &mut Self {
|
2019-10-06 22:14:34 +00:00
|
|
|
self.message[0] = (msg.into(), Style::NoStyle);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2017-01-11 21:55:41 +00:00
|
|
|
pub fn message(&self) -> String {
|
2018-10-09 12:30:14 +00:00
|
|
|
self.message.iter().map(|i| i.0.as_str()).collect::<String>()
|
2017-01-11 21:55:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
pub fn styled_message(&self) -> &Vec<(String, Style)> {
|
2016-10-11 16:26:32 +00:00
|
|
|
&self.message
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Convenience function for internal use, clients should use one of the
|
|
|
|
/// public methods above.
|
2021-03-15 19:11:40 +00:00
|
|
|
///
|
|
|
|
/// Used by `proc_macro_server` for implementing `server::Diagnostic`.
|
2019-12-22 22:42:04 +00:00
|
|
|
pub fn sub(
|
|
|
|
&mut self,
|
|
|
|
level: Level,
|
|
|
|
message: &str,
|
|
|
|
span: MultiSpan,
|
|
|
|
render_span: Option<MultiSpan>,
|
|
|
|
) {
|
2016-10-11 16:26:32 +00:00
|
|
|
let sub = SubDiagnostic {
|
2017-08-07 05:54:09 +00:00
|
|
|
level,
|
2017-01-11 21:55:41 +00:00
|
|
|
message: vec![(message.to_owned(), Style::NoStyle)],
|
2017-08-07 05:54:09 +00:00
|
|
|
span,
|
|
|
|
render_span,
|
2016-10-11 16:26:32 +00:00
|
|
|
};
|
|
|
|
self.children.push(sub);
|
|
|
|
}
|
2017-01-11 21:55:41 +00:00
|
|
|
|
|
|
|
/// Convenience function for internal use, clients should use one of the
|
|
|
|
/// public methods above.
|
2019-12-22 22:42:04 +00:00
|
|
|
fn sub_with_highlights(
|
|
|
|
&mut self,
|
|
|
|
level: Level,
|
|
|
|
message: Vec<(String, Style)>,
|
|
|
|
span: MultiSpan,
|
|
|
|
render_span: Option<MultiSpan>,
|
|
|
|
) {
|
|
|
|
let sub = SubDiagnostic { level, message, span, render_span };
|
2017-01-11 21:55:41 +00:00
|
|
|
self.children.push(sub);
|
|
|
|
}
|
2021-09-04 11:26:25 +00:00
|
|
|
|
|
|
|
/// Fields used for Hash, and PartialEq trait
|
|
|
|
fn keys(
|
|
|
|
&self,
|
|
|
|
) -> (
|
|
|
|
&Level,
|
|
|
|
&Vec<(String, Style)>,
|
|
|
|
&Option<DiagnosticId>,
|
|
|
|
&MultiSpan,
|
2022-01-24 09:19:33 +00:00
|
|
|
&Result<Vec<CodeSuggestion>, SuggestionsDisabled>,
|
2021-09-04 11:26:25 +00:00
|
|
|
Option<&Vec<SubDiagnostic>>,
|
|
|
|
) {
|
|
|
|
(
|
|
|
|
&self.level,
|
|
|
|
&self.message,
|
|
|
|
&self.code,
|
|
|
|
&self.span,
|
|
|
|
&self.suggestions,
|
|
|
|
(if self.is_lint { None } else { Some(&self.children) }),
|
|
|
|
)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Hash for Diagnostic {
|
|
|
|
fn hash<H>(&self, state: &mut H)
|
|
|
|
where
|
|
|
|
H: Hasher,
|
|
|
|
{
|
|
|
|
self.keys().hash(state);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl PartialEq for Diagnostic {
|
|
|
|
fn eq(&self, other: &Self) -> bool {
|
|
|
|
self.keys() == other.keys()
|
|
|
|
}
|
2017-01-11 21:55:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
impl SubDiagnostic {
|
|
|
|
pub fn message(&self) -> String {
|
2018-10-09 12:30:14 +00:00
|
|
|
self.message.iter().map(|i| i.0.as_str()).collect::<String>()
|
2017-01-11 21:55:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
pub fn styled_message(&self) -> &Vec<(String, Style)> {
|
|
|
|
&self.message
|
|
|
|
}
|
2016-10-11 16:26:32 +00:00
|
|
|
}
|