languages/rust
languages/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust synced 2024-10-01 06:14:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge spans for the suggestion

Browse source
This commit is contained in:
Stanislav Tkach 2020-05-23 00:16:17 +03:00
parent 34b51187ce
commit a9199de34d
5 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/librustc_typeck/check/callee.rs
View file

@ -35,13 +35,18 @@ pub fn check_legal_trait_for_method_call(
.and_then(|s| tcx.sess.source_map().span_to_snippet(s).ok())
.unwrap_or_default();
let (suggestion, applicability) = if snippet.is_empty() {
(snippet, Applicability::Unspecified)
} else {
(format!("drop({})", snippet), Applicability::MachineApplicable)
};
let suggestion =
if snippet.is_empty() { "drop".to_string() } else { format!("drop({})", snippet) };
err.span_suggestion(span, "consider using `drop` function", suggestion, applicability);
let suggestion_span =
receiver.and_then(|s| tcx.sess.source_map().merge_spans(s, span)).unwrap_or(span);
err.span_suggestion(
suggestion_span,
"consider using `drop` function",
suggestion,
Applicability::MaybeIncorrect,
);
err.emit();
}

8
src/test/ui/error-codes/E0040.stderr
View file

@ -2,10 +2,10 @@ error[E0040]: explicit use of destructor method
--> $DIR/E0040.rs:13:7
|
LL | x.drop();
| ^^^^
| |
| explicit destructor calls not allowed
| help: consider using `drop` function: `drop(x)`
| --^^^^
| | |
| | explicit destructor calls not allowed
| help: consider using `drop` function: `drop(x)`
error: aborting due to previous error

8
src/test/ui/explicit/explicit-call-to-dtor.stderr
View file

@ -2,10 +2,10 @@ error[E0040]: explicit use of destructor method
--> $DIR/explicit-call-to-dtor.rs:13:7
|
LL | x.drop();
| ^^^^
| |
| explicit destructor calls not allowed
| help: consider using `drop` function: `drop(x)`
| --^^^^
| | |
| | explicit destructor calls not allowed
| help: consider using `drop` function: `drop(x)`
error: aborting due to previous error

8
src/test/ui/explicit/explicit-call-to-supertrait-dtor.stderr
View file

@ -2,10 +2,10 @@ error[E0040]: explicit use of destructor method
--> $DIR/explicit-call-to-supertrait-dtor.rs:17:14
|
LL | self.drop();
| ^^^^
| |
| explicit destructor calls not allowed
| help: consider using `drop` function: `drop(self)`
| -----^^^^
| | |
| | explicit destructor calls not allowed
| help: consider using `drop` function: `drop(self)`
error: aborting due to previous error

2
src/test/ui/illegal-ufcs-drop.stderr
View file

@ -5,7 +5,7 @@ LL | Drop::drop(&mut Foo)
| ^^^^^^^^^^
| |
| explicit destructor calls not allowed
| help: consider using `drop` function
| help: consider using `drop` function: `drop`
error: aborting due to previous error