Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add comparison operators to must-use lint (under fn_must_use feature) #44103

Merged
merged 2 commits into from
Sep 24, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion src/librustc_lint/unused.rs
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnusedResults {
};

let mut fn_warned = false;
let mut op_warned = false;
if cx.tcx.sess.features.borrow().fn_must_use {
let maybe_def = match expr.node {
hir::ExprCall(ref callee, _) => {
Expand All @@ -172,9 +173,24 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnusedResults {
let def_id = def.def_id();
fn_warned = check_must_use(cx, def_id, s.span, "return value of ");
}

if let hir::ExprBinary(bin_op, ..) = expr.node {
match bin_op.node {
// Hardcoding the comparison operators here seemed more
// expedient than the refactoring that would be needed to
// look up the `#[must_use]` attribute which does exist on
// the comparison trait methods
hir::BiEq | hir::BiLt | hir::BiLe | hir::BiNe | hir::BiGe | hir::BiGt => {
let msg = "unused comparison which must be used";
cx.span_lint(UNUSED_MUST_USE, expr.span, msg);
op_warned = true;
},
_ => {},
}
}
}

if !(ty_warned || fn_warned) {
if !(ty_warned || fn_warned || op_warned) {
cx.span_lint(UNUSED_RESULTS, s.span, "unused result");
}

Expand Down
2 changes: 1 addition & 1 deletion src/libsyntax/feature_gate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ declare_features! (
// #[doc(masked)]
(active, doc_masked, "1.21.0", None),

// allow `#[must_use]` on functions (RFC 1940)
// allow `#[must_use]` on functions and comparison operators (RFC 1940)
(active, fn_must_use, "1.21.0", Some(43302)),

// allow '|' at beginning of match arms (RFC 1925)
Expand Down
10 changes: 8 additions & 2 deletions src/test/ui/rfc_1940-must_use_on_functions/fn_must_use.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#![feature(fn_must_use)]
#![warn(unused_must_use)]

#[derive(PartialEq, Eq)]
struct MyStruct {
n: usize,
}
Expand Down Expand Up @@ -58,13 +59,18 @@ fn main() {
need_to_use_this_value();

let mut m = MyStruct { n: 2 };
let n = MyStruct { n: 3 };

m.need_to_use_this_method_value();
m.is_even(); // trait method!

m.replace(3);
m.replace(3); // won't warn (annotation needs to be in trait definition)

// comparison methods are `must_use`
2.eq(&3);
m.eq(&n);

// FIXME: operators should probably be `must_use` if underlying method is
// lint includes comparison operators
2 == 3;
m == n;
}
34 changes: 26 additions & 8 deletions src/test/ui/rfc_1940-must_use_on_functions/fn_must_use.stderr
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
warning: unused return value of `need_to_use_this_value` which must be used: it's important
--> $DIR/fn_must_use.rs:58:5
--> $DIR/fn_must_use.rs:59:5
|
58 | need_to_use_this_value();
59 | need_to_use_this_value();
| ^^^^^^^^^^^^^^^^^^^^^^^^^
|
note: lint level defined here
Expand All @@ -11,20 +11,38 @@ note: lint level defined here
| ^^^^^^^^^^^^^^^

warning: unused return value of `MyStruct::need_to_use_this_method_value` which must be used
--> $DIR/fn_must_use.rs:61:5
--> $DIR/fn_must_use.rs:64:5
|
61 | m.need_to_use_this_method_value();
64 | m.need_to_use_this_method_value();
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

warning: unused return value of `EvenNature::is_even` which must be used: no side effects
--> $DIR/fn_must_use.rs:62:5
--> $DIR/fn_must_use.rs:65:5
|
62 | m.is_even(); // trait method!
65 | m.is_even(); // trait method!
| ^^^^^^^^^^^^

warning: unused return value of `std::cmp::PartialEq::eq` which must be used
--> $DIR/fn_must_use.rs:66:5
--> $DIR/fn_must_use.rs:70:5
|
66 | 2.eq(&3);
70 | 2.eq(&3);
| ^^^^^^^^^

warning: unused return value of `std::cmp::PartialEq::eq` which must be used
--> $DIR/fn_must_use.rs:71:5
|
71 | m.eq(&n);
| ^^^^^^^^^

warning: unused comparison which must be used
--> $DIR/fn_must_use.rs:74:5
|
74 | 2 == 3;
| ^^^^^^

warning: unused comparison which must be used
--> $DIR/fn_must_use.rs:75:5
|
75 | m == n;
| ^^^^^^