nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-26 08:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply review suggestion

Browse Source
This commit is contained in:
Yuki Okushi 2021-07-31 06:21:52 +09:00
parent f3c59a8df6
commit 924eddf30d
No known key found for this signature in database
GPG Key ID: DABA5B072961C18A
5 changed files with 157 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
compiler/rustc_lint/src/unused.rs
View File

@ -162,16 +162,13 @@ impl<'tcx> LateLintPass<'tcx> for UnusedResults {
if let Some(must_use_op) = must_use_op {
cx.struct_span_lint(UNUSED_MUST_USE, expr.span, |lint| {
let mut lint = lint.build(&format!("unused {} that must be used", must_use_op));
lint.note(&format!("the {} produces a value", must_use_op));
if let Ok(snippet) = cx.sess().source_map().span_to_snippet(expr.span) {
lint.span_suggestion(
expr.span,
"use `let _ = ...` to ignore it",
format!("let _ = {}", snippet),
Applicability::MachineApplicable,
)
.emit()
}
lint.span_label(expr.span, &format!("the {} produces a value", must_use_op));
lint.span_suggestion_verbose(
expr.span.shrink_to_lo(),
"use `let _ = ...` to ignore the resulting value",
"let _ = ".to_string(),
Applicability::MachineApplicable,
);
lint.emit();
});
op_warned = true;

14
src/test/ui/lint/fn_must_use.stderr
View File

@ -47,17 +47,23 @@ warning: unused comparison that must be used
--> $DIR/fn_must_use.rs:74:5
|
LL | 2 == 3;
| ^^^^^^ help: use `let _ = ...` to ignore it: `let _ = 2 == 3`
| ^^^^^^ the comparison produces a value
|
= note: the comparison produces a value
help: use `let _ = ...` to ignore the resulting value
|
LL | let _ = 2 == 3;
| ^^^^^^^
warning: unused comparison that must be used
--> $DIR/fn_must_use.rs:75:5
|
LL | m == n;
| ^^^^^^ help: use `let _ = ...` to ignore it: `let _ = m == n`
| ^^^^^^ the comparison produces a value
|
= note: the comparison produces a value
help: use `let _ = ...` to ignore the resulting value
|
LL | let _ = m == n;
| ^^^^^^^
warning: 8 warnings emitted

42
src/test/ui/lint/unused-borrows.stderr
View File

@ -2,54 +2,72 @@ error: unused borrow that must be used
--> $DIR/unused-borrows.rs:6:5
|
LL | &42;
| ^^^ help: use `let _ = ...` to ignore it: `let _ = &42`
| ^^^ the borrow produces a value
|
note: the lint level is defined here
--> $DIR/unused-borrows.rs:1:9
|
LL | #![deny(unused_must_use)]
| ^^^^^^^^^^^^^^^
= note: the borrow produces a value
help: use `let _ = ...` to ignore the resulting value
|
LL | let _ = &42;
| ^^^^^^^
error: unused borrow that must be used
--> $DIR/unused-borrows.rs:9:5
|
LL | &mut foo(42);
| ^^^^^^^^^^^^ help: use `let _ = ...` to ignore it: `let _ = &mut foo(42)`
| ^^^^^^^^^^^^ the borrow produces a value
|
= note: the borrow produces a value
help: use `let _ = ...` to ignore the resulting value
|
LL | let _ = &mut foo(42);
| ^^^^^^^
error: unused borrow that must be used
--> $DIR/unused-borrows.rs:12:5
|
LL | &&42;
| ^^^^ help: use `let _ = ...` to ignore it: `let _ = &&42`
| ^^^^ the borrow produces a value
|
= note: the borrow produces a value
help: use `let _ = ...` to ignore the resulting value
|
LL | let _ = &&42;
| ^^^^^^^
error: unused borrow that must be used
--> $DIR/unused-borrows.rs:15:5
|
LL | &&mut 42;
| ^^^^^^^^ help: use `let _ = ...` to ignore it: `let _ = &&mut 42`
| ^^^^^^^^ the borrow produces a value
|
= note: the borrow produces a value
help: use `let _ = ...` to ignore the resulting value
|
LL | let _ = &&mut 42;
| ^^^^^^^
error: unused borrow that must be used
--> $DIR/unused-borrows.rs:18:5
|
LL | &mut &42;
| ^^^^^^^^ help: use `let _ = ...` to ignore it: `let _ = &mut &42`
| ^^^^^^^^ the borrow produces a value
|
= note: the borrow produces a value
help: use `let _ = ...` to ignore the resulting value
|
LL | let _ = &mut &42;
| ^^^^^^^
error: unused borrow that must be used
--> $DIR/unused-borrows.rs:23:5
|
LL | && foo(42);
| ^^^^^^^^^^ help: use `let _ = ...` to ignore it: `let _ = && foo(42)`
| ^^^^^^^^^^ the borrow produces a value
|
= note: the borrow produces a value
help: use `let _ = ...` to ignore the resulting value
|
LL | let _ = && foo(42);
| ^^^^^^^
error: aborting due to 6 previous errors

7
src/test/ui/lint/unused/issue-85913.stderr
View File

@ -2,14 +2,17 @@ error: unused logical operation that must be used
--> $DIR/issue-85913.rs:4:5
|
LL | function() && return 1;
| ^^^^^^^^^^^^^^^^^^^^^^ help: use `let _ = ...` to ignore it: `let _ = function() && return 1`
| ^^^^^^^^^^^^^^^^^^^^^^ the logical operation produces a value
|
note: the lint level is defined here
--> $DIR/issue-85913.rs:1:9
|
LL | #![deny(unused_must_use)]
| ^^^^^^^^^^^^^^^
= note: the logical operation produces a value
help: use `let _ = ...` to ignore the resulting value
|
LL | let _ = function() && return 1;
| ^^^^^^^
error: aborting due to previous error

147
src/test/ui/lint/unused/must-use-ops.stderr
View File

@ -2,174 +2,237 @@ warning: unused comparison that must be used
--> $DIR/must-use-ops.rs:12:5
|
LL | val == 1;
| ^^^^^^^^ help: use `let _ = ...` to ignore it: `let _ = val == 1`
| ^^^^^^^^ the comparison produces a value
|
note: the lint level is defined here
--> $DIR/must-use-ops.rs:5:9
|
LL | #![warn(unused_must_use)]
| ^^^^^^^^^^^^^^^
= note: the comparison produces a value
help: use `let _ = ...` to ignore the resulting value
|
LL | let _ = val == 1;
| ^^^^^^^
warning: unused comparison that must be used
--> $DIR/must-use-ops.rs:13:5
|
LL | val < 1;
| ^^^^^^^ help: use `let _ = ...` to ignore it: `let _ = val < 1`
| ^^^^^^^ the comparison produces a value
|
= note: the comparison produces a value
help: use `let _ = ...` to ignore the resulting value
|
LL | let _ = val < 1;
| ^^^^^^^
warning: unused comparison that must be used
--> $DIR/must-use-ops.rs:14:5
|
LL | val <= 1;
| ^^^^^^^^ help: use `let _ = ...` to ignore it: `let _ = val <= 1`
| ^^^^^^^^ the comparison produces a value
|
= note: the comparison produces a value
help: use `let _ = ...` to ignore the resulting value
|
LL | let _ = val <= 1;
| ^^^^^^^
warning: unused comparison that must be used
--> $DIR/must-use-ops.rs:15:5
|
LL | val != 1;
| ^^^^^^^^ help: use `let _ = ...` to ignore it: `let _ = val != 1`
| ^^^^^^^^ the comparison produces a value
|
= note: the comparison produces a value
help: use `let _ = ...` to ignore the resulting value
|
LL | let _ = val != 1;
| ^^^^^^^
warning: unused comparison that must be used
--> $DIR/must-use-ops.rs:16:5
|
LL | val >= 1;
| ^^^^^^^^ help: use `let _ = ...` to ignore it: `let _ = val >= 1`
| ^^^^^^^^ the comparison produces a value
|
= note: the comparison produces a value
help: use `let _ = ...` to ignore the resulting value
|
LL | let _ = val >= 1;
| ^^^^^^^
warning: unused comparison that must be used
--> $DIR/must-use-ops.rs:17:5
|
LL | val > 1;
| ^^^^^^^ help: use `let _ = ...` to ignore it: `let _ = val > 1`
| ^^^^^^^ the comparison produces a value
|
= note: the comparison produces a value
help: use `let _ = ...` to ignore the resulting value
|
LL | let _ = val > 1;
| ^^^^^^^
warning: unused arithmetic operation that must be used
--> $DIR/must-use-ops.rs:20:5
|
LL | val + 2;
| ^^^^^^^ help: use `let _ = ...` to ignore it: `let _ = val + 2`
| ^^^^^^^ the arithmetic operation produces a value
|
= note: the arithmetic operation produces a value
help: use `let _ = ...` to ignore the resulting value
|
LL | let _ = val + 2;
| ^^^^^^^
warning: unused arithmetic operation that must be used
--> $DIR/must-use-ops.rs:21:5
|
LL | val - 2;
| ^^^^^^^ help: use `let _ = ...` to ignore it: `let _ = val - 2`
| ^^^^^^^ the arithmetic operation produces a value
|
= note: the arithmetic operation produces a value
help: use `let _ = ...` to ignore the resulting value
|
LL | let _ = val - 2;
| ^^^^^^^
warning: unused arithmetic operation that must be used
--> $DIR/must-use-ops.rs:22:5
|
LL | val / 2;
| ^^^^^^^ help: use `let _ = ...` to ignore it: `let _ = val / 2`
| ^^^^^^^ the arithmetic operation produces a value
|
= note: the arithmetic operation produces a value
help: use `let _ = ...` to ignore the resulting value
|
LL | let _ = val / 2;
| ^^^^^^^
warning: unused arithmetic operation that must be used
--> $DIR/must-use-ops.rs:23:5
|
LL | val * 2;
| ^^^^^^^ help: use `let _ = ...` to ignore it: `let _ = val * 2`
| ^^^^^^^ the arithmetic operation produces a value
|
= note: the arithmetic operation produces a value
help: use `let _ = ...` to ignore the resulting value
|
LL | let _ = val * 2;
| ^^^^^^^
warning: unused arithmetic operation that must be used
--> $DIR/must-use-ops.rs:24:5
|
LL | val % 2;
| ^^^^^^^ help: use `let _ = ...` to ignore it: `let _ = val % 2`
| ^^^^^^^ the arithmetic operation produces a value
|
= note: the arithmetic operation produces a value
help: use `let _ = ...` to ignore the resulting value
|
LL | let _ = val % 2;
| ^^^^^^^
warning: unused logical operation that must be used
--> $DIR/must-use-ops.rs:27:5
|
LL | true && true;
| ^^^^^^^^^^^^ help: use `let _ = ...` to ignore it: `let _ = true && true`
| ^^^^^^^^^^^^ the logical operation produces a value
|
= note: the logical operation produces a value
help: use `let _ = ...` to ignore the resulting value
|
LL | let _ = true && true;
| ^^^^^^^
warning: unused logical operation that must be used
--> $DIR/must-use-ops.rs:28:5
|
LL | false || true;
| ^^^^^^^^^^^^^ help: use `let _ = ...` to ignore it: `let _ = false || true`
| ^^^^^^^^^^^^^ the logical operation produces a value
|
= note: the logical operation produces a value
help: use `let _ = ...` to ignore the resulting value
|
LL | let _ = false || true;
| ^^^^^^^
warning: unused bitwise operation that must be used
--> $DIR/must-use-ops.rs:31:5
|
LL | 5 ^ val;
| ^^^^^^^ help: use `let _ = ...` to ignore it: `let _ = 5 ^ val`
| ^^^^^^^ the bitwise operation produces a value
|
= note: the bitwise operation produces a value
help: use `let _ = ...` to ignore the resulting value
|
LL | let _ = 5 ^ val;
| ^^^^^^^
warning: unused bitwise operation that must be used
--> $DIR/must-use-ops.rs:32:5
|
LL | 5 & val;
| ^^^^^^^ help: use `let _ = ...` to ignore it: `let _ = 5 & val`
| ^^^^^^^ the bitwise operation produces a value
|
= note: the bitwise operation produces a value
help: use `let _ = ...` to ignore the resulting value
|
LL | let _ = 5 & val;
| ^^^^^^^
warning: unused bitwise operation that must be used
--> $DIR/must-use-ops.rs:33:5
|
LL | 5 | val;
| ^^^^^^^ help: use `let _ = ...` to ignore it: `let _ = 5 | val`
| ^^^^^^^ the bitwise operation produces a value
|
= note: the bitwise operation produces a value
help: use `let _ = ...` to ignore the resulting value
|
LL | let _ = 5 | val;
| ^^^^^^^
warning: unused bitwise operation that must be used
--> $DIR/must-use-ops.rs:34:5
|
LL | 5 << val;
| ^^^^^^^^ help: use `let _ = ...` to ignore it: `let _ = 5 << val`
| ^^^^^^^^ the bitwise operation produces a value
|
= note: the bitwise operation produces a value
help: use `let _ = ...` to ignore the resulting value
|
LL | let _ = 5 << val;
| ^^^^^^^
warning: unused bitwise operation that must be used
--> $DIR/must-use-ops.rs:35:5
|
LL | 5 >> val;
| ^^^^^^^^ help: use `let _ = ...` to ignore it: `let _ = 5 >> val`
| ^^^^^^^^ the bitwise operation produces a value
|
= note: the bitwise operation produces a value
help: use `let _ = ...` to ignore the resulting value
|
LL | let _ = 5 >> val;
| ^^^^^^^
warning: unused unary operation that must be used
--> $DIR/must-use-ops.rs:38:5
|
LL | !val;
| ^^^^ help: use `let _ = ...` to ignore it: `let _ = !val`
| ^^^^ the unary operation produces a value
|
= note: the unary operation produces a value
help: use `let _ = ...` to ignore the resulting value
|
LL | let _ = !val;
| ^^^^^^^
warning: unused unary operation that must be used
--> $DIR/must-use-ops.rs:39:5
|
LL | -val;
| ^^^^ help: use `let _ = ...` to ignore it: `let _ = -val`
| ^^^^ the unary operation produces a value
|
= note: the unary operation produces a value
help: use `let _ = ...` to ignore the resulting value
|
LL | let _ = -val;
| ^^^^^^^
warning: unused unary operation that must be used
--> $DIR/must-use-ops.rs:40:5
|
LL | *val_pointer;
| ^^^^^^^^^^^^ help: use `let _ = ...` to ignore it: `let _ = *val_pointer`
| ^^^^^^^^^^^^ the unary operation produces a value
|
= note: the unary operation produces a value
help: use `let _ = ...` to ignore the resulting value
|
LL | let _ = *val_pointer;
| ^^^^^^^
warning: 21 warnings emitted