2016-10-19 17:19:00 -04:00
|
|
|
// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
|
|
|
|
// file at the top-level directory of this distribution and at
|
|
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
|
|
//
|
|
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
|
|
// option. This file may not be copied, modified, or distributed
|
|
|
|
// except according to those terms.
|
|
|
|
|
2016-10-11 12:26:32 -04:00
|
|
|
use Diagnostic;
|
2017-10-27 08:21:22 +02:00
|
|
|
use DiagnosticId;
|
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 14:31:59 -08:00
|
|
|
use DiagnosticStyledString;
|
|
|
|
|
2016-10-11 12:26:32 -04:00
|
|
|
use Level;
|
|
|
|
use Handler;
|
|
|
|
use std::fmt::{self, Debug};
|
|
|
|
use std::ops::{Deref, DerefMut};
|
|
|
|
use std::thread::panicking;
|
|
|
|
use syntax_pos::{MultiSpan, Span};
|
|
|
|
|
|
|
|
/// Used for emitting structured error messages and other diagnostic information.
|
|
|
|
#[must_use]
|
|
|
|
#[derive(Clone)]
|
|
|
|
pub struct DiagnosticBuilder<'a> {
|
2017-11-18 20:16:10 +00:00
|
|
|
pub handler: &'a Handler,
|
2016-10-11 12:26:32 -04:00
|
|
|
diagnostic: Diagnostic,
|
|
|
|
}
|
|
|
|
|
|
|
|
/// In general, the `DiagnosticBuilder` uses deref to allow access to
|
|
|
|
/// the fields and methods of the embedded `diagnostic` in a
|
|
|
|
/// transparent way. *However,* many of the methods are intended to
|
|
|
|
/// be used in a chained way, and hence ought to return `self`. In
|
|
|
|
/// that case, we can't just naively forward to the method on the
|
|
|
|
/// `diagnostic`, because the return type would be a `&Diagnostic`
|
|
|
|
/// instead of a `&DiagnosticBuilder<'a>`. This `forward!` macro makes
|
|
|
|
/// it easy to declare such methods on the builder.
|
|
|
|
macro_rules! forward {
|
|
|
|
// Forward pattern for &self -> &Self
|
|
|
|
(pub fn $n:ident(&self, $($name:ident: $ty:ty),*) -> &Self) => {
|
|
|
|
pub fn $n(&self, $($name: $ty),*) -> &Self {
|
|
|
|
self.diagnostic.$n($($name),*);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
// Forward pattern for &mut self -> &mut Self
|
|
|
|
(pub fn $n:ident(&mut self, $($name:ident: $ty:ty),*) -> &mut Self) => {
|
|
|
|
pub fn $n(&mut self, $($name: $ty),*) -> &mut Self {
|
|
|
|
self.diagnostic.$n($($name),*);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
// Forward pattern for &mut self -> &mut Self, with S: Into<MultiSpan>
|
|
|
|
// type parameter. No obvious way to make this more generic.
|
|
|
|
(pub fn $n:ident<S: Into<MultiSpan>>(&mut self, $($name:ident: $ty:ty),*) -> &mut Self) => {
|
|
|
|
pub fn $n<S: Into<MultiSpan>>(&mut self, $($name: $ty),*) -> &mut Self {
|
|
|
|
self.diagnostic.$n($($name),*);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a> Deref for DiagnosticBuilder<'a> {
|
|
|
|
type Target = Diagnostic;
|
|
|
|
|
|
|
|
fn deref(&self) -> &Diagnostic {
|
|
|
|
&self.diagnostic
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a> DerefMut for DiagnosticBuilder<'a> {
|
|
|
|
fn deref_mut(&mut self) -> &mut Diagnostic {
|
|
|
|
&mut self.diagnostic
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a> DiagnosticBuilder<'a> {
|
|
|
|
/// Emit the diagnostic.
|
|
|
|
pub fn emit(&mut self) {
|
|
|
|
if self.cancelled() {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2017-07-31 15:54:16 +03:00
|
|
|
let is_error = match self.level {
|
2016-10-12 16:38:58 -04:00
|
|
|
Level::Bug |
|
|
|
|
Level::Fatal |
|
|
|
|
Level::PhaseFatal |
|
|
|
|
Level::Error => {
|
2017-07-31 15:54:16 +03:00
|
|
|
true
|
2016-10-12 16:38:58 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
Level::Warning |
|
|
|
|
Level::Note |
|
|
|
|
Level::Help |
|
|
|
|
Level::Cancelled => {
|
2017-07-31 15:54:16 +03:00
|
|
|
false
|
2016-10-12 16:38:58 -04:00
|
|
|
}
|
2017-07-31 15:54:16 +03:00
|
|
|
};
|
2016-10-12 16:38:58 -04:00
|
|
|
|
2017-08-12 15:37:28 -07:00
|
|
|
self.handler.emit_db(&self);
|
2016-10-11 12:26:32 -04:00
|
|
|
self.cancel();
|
2017-05-12 12:48:18 +01:00
|
|
|
|
2017-07-31 15:54:16 +03:00
|
|
|
if is_error {
|
|
|
|
self.handler.bump_err_count();
|
2017-05-12 12:48:18 +01:00
|
|
|
}
|
2016-10-11 12:26:32 -04:00
|
|
|
|
|
|
|
// if self.is_fatal() {
|
|
|
|
// panic!(FatalError);
|
|
|
|
// }
|
|
|
|
}
|
|
|
|
|
2017-08-28 02:56:43 -07:00
|
|
|
/// Convenience function for internal use, clients should use one of the
|
|
|
|
/// span_* methods instead.
|
|
|
|
pub fn sub<S: Into<MultiSpan>>(
|
|
|
|
&mut self,
|
|
|
|
level: Level,
|
|
|
|
message: &str,
|
|
|
|
span: Option<S>,
|
|
|
|
) -> &mut Self {
|
|
|
|
let span = span.map(|s| s.into()).unwrap_or(MultiSpan::new());
|
|
|
|
self.diagnostic.sub(level, message, span, None);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2017-08-23 12:52:22 -07: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.
|
|
|
|
pub fn delay_as_bug(&mut self) {
|
|
|
|
self.level = Level::Bug;
|
|
|
|
*self.handler.delayed_span_bug.borrow_mut() = Some(self.diagnostic.clone());
|
|
|
|
self.cancel();
|
|
|
|
}
|
|
|
|
|
2016-10-11 12:26:32 -04:00
|
|
|
/// Add a span/label to be included in the resulting snippet.
|
|
|
|
/// This is pushed onto the `MultiSpan` that was created when the
|
|
|
|
/// diagnostic was first built. If you don't call this function at
|
|
|
|
/// all, and you just supplied a `Span` to create the diagnostic,
|
|
|
|
/// then the snippet will just include that `Span`, which is
|
|
|
|
/// called the primary span.
|
2017-05-04 14:17:23 +02:00
|
|
|
pub fn span_label<T: Into<String>>(&mut self, span: Span, label: T) -> &mut Self {
|
|
|
|
self.diagnostic.span_label(span, label);
|
|
|
|
self
|
|
|
|
}
|
2016-10-11 12:26:32 -04:00
|
|
|
|
|
|
|
forward!(pub fn note_expected_found(&mut self,
|
|
|
|
label: &fmt::Display,
|
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 14:31:59 -08:00
|
|
|
expected: DiagnosticStyledString,
|
|
|
|
found: DiagnosticStyledString)
|
2016-10-11 12:26:32 -04:00
|
|
|
-> &mut Self);
|
|
|
|
|
|
|
|
forward!(pub fn note_expected_found_extra(&mut self,
|
|
|
|
label: &fmt::Display,
|
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 14:31:59 -08:00
|
|
|
expected: DiagnosticStyledString,
|
|
|
|
found: DiagnosticStyledString,
|
2016-10-11 12:26:32 -04:00
|
|
|
expected_extra: &fmt::Display,
|
|
|
|
found_extra: &fmt::Display)
|
|
|
|
-> &mut Self);
|
|
|
|
|
|
|
|
forward!(pub fn note(&mut self, msg: &str) -> &mut Self);
|
|
|
|
forward!(pub fn span_note<S: Into<MultiSpan>>(&mut self,
|
|
|
|
sp: S,
|
|
|
|
msg: &str)
|
|
|
|
-> &mut Self);
|
|
|
|
forward!(pub fn warn(&mut self, msg: &str) -> &mut Self);
|
|
|
|
forward!(pub fn span_warn<S: Into<MultiSpan>>(&mut self, sp: S, msg: &str) -> &mut Self);
|
|
|
|
forward!(pub fn help(&mut self , msg: &str) -> &mut Self);
|
|
|
|
forward!(pub fn span_help<S: Into<MultiSpan>>(&mut self,
|
|
|
|
sp: S,
|
|
|
|
msg: &str)
|
|
|
|
-> &mut Self);
|
2017-07-16 11:43:24 -07:00
|
|
|
forward!(pub fn span_suggestion_short(&mut self,
|
|
|
|
sp: Span,
|
|
|
|
msg: &str,
|
|
|
|
suggestion: String)
|
|
|
|
-> &mut Self);
|
2017-03-24 17:31:41 +01:00
|
|
|
forward!(pub fn span_suggestion(&mut self,
|
|
|
|
sp: Span,
|
|
|
|
msg: &str,
|
|
|
|
suggestion: String)
|
|
|
|
-> &mut Self);
|
2017-05-09 10:04:24 +02:00
|
|
|
forward!(pub fn span_suggestions(&mut self,
|
|
|
|
sp: Span,
|
|
|
|
msg: &str,
|
|
|
|
suggestions: Vec<String>)
|
|
|
|
-> &mut Self);
|
2016-10-11 12:26:32 -04:00
|
|
|
forward!(pub fn set_span<S: Into<MultiSpan>>(&mut self, sp: S) -> &mut Self);
|
2017-10-27 08:21:22 +02:00
|
|
|
forward!(pub fn code(&mut self, s: DiagnosticId) -> &mut Self);
|
2016-10-11 12:26:32 -04:00
|
|
|
|
|
|
|
/// Convenience function for internal use, clients should use one of the
|
|
|
|
/// struct_* methods on Handler.
|
|
|
|
pub fn new(handler: &'a Handler, level: Level, message: &str) -> DiagnosticBuilder<'a> {
|
|
|
|
DiagnosticBuilder::new_with_code(handler, level, None, message)
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Convenience function for internal use, clients should use one of the
|
|
|
|
/// struct_* methods on Handler.
|
|
|
|
pub fn new_with_code(handler: &'a Handler,
|
|
|
|
level: Level,
|
2017-10-27 08:21:22 +02:00
|
|
|
code: Option<DiagnosticId>,
|
2016-10-11 12:26:32 -04:00
|
|
|
message: &str)
|
|
|
|
-> DiagnosticBuilder<'a> {
|
2017-08-12 15:37:28 -07:00
|
|
|
let diagnostic = Diagnostic::new_with_code(level, code, message);
|
|
|
|
DiagnosticBuilder::new_diagnostic(handler, diagnostic)
|
|
|
|
}
|
|
|
|
|
2017-08-23 12:52:22 -07:00
|
|
|
/// Creates a new `DiagnosticBuilder` with an already constructed
|
|
|
|
/// diagnostic.
|
|
|
|
pub fn new_diagnostic(handler: &'a Handler, diagnostic: Diagnostic)
|
|
|
|
-> DiagnosticBuilder<'a> {
|
2017-08-12 15:37:28 -07:00
|
|
|
DiagnosticBuilder { handler, diagnostic }
|
2016-10-11 12:26:32 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a> Debug for DiagnosticBuilder<'a> {
|
|
|
|
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
|
|
|
self.diagnostic.fmt(f)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-08-15 21:45:21 +02:00
|
|
|
/// Destructor bomb - a `DiagnosticBuilder` must be either emitted or canceled
|
2017-05-19 01:20:48 +02:00
|
|
|
/// or we emit a bug.
|
2016-10-11 12:26:32 -04:00
|
|
|
impl<'a> Drop for DiagnosticBuilder<'a> {
|
|
|
|
fn drop(&mut self) {
|
|
|
|
if !panicking() && !self.cancelled() {
|
|
|
|
let mut db = DiagnosticBuilder::new(self.handler,
|
|
|
|
Level::Bug,
|
|
|
|
"Error constructed but not emitted");
|
|
|
|
db.emit();
|
|
|
|
panic!();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|