Skip to content

Commit 04b7af9

Browse files
committed
---
yaml --- r: 187952 b: refs/heads/tmp c: f38b83b h: refs/heads/master v: v3
1 parent 07a1e5d commit 04b7af9

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
3434
refs/heads/beta: 522d09dfecbeca1595f25ac58c6d0178bbd21d7d
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3636
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
37-
refs/heads/tmp: 2a37f7f07ca6bc3e3f19c6bb33b25bbc35f561a2
37+
refs/heads/tmp: f38b83b3609b060df5ab3d2a57e98020b8b29efb
3838
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/tmp/src/librustc_lint/builtin.rs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -741,23 +741,24 @@ impl LintPass for UnusedResults {
741741
}
742742

743743
let t = ty::expr_ty(cx.tcx, expr);
744-
let mut warned = false;
745-
match t.sty {
744+
let warned = match t.sty {
746745
ty::ty_tup(ref tys) if tys.is_empty() => return,
747746
ty::ty_bool => return,
748747
ty::ty_struct(did, _) |
749748
ty::ty_enum(did, _) => {
750749
if ast_util::is_local(did) {
751750
if let ast_map::NodeItem(it) = cx.tcx.map.get(did.node) {
752-
warned |= check_must_use(cx, &it.attrs, s.span);
751+
check_must_use(cx, &it.attrs, s.span)
752+
} else {
753+
false
753754
}
754755
} else {
755756
let attrs = csearch::get_item_attrs(&cx.sess().cstore, did);
756-
warned |= check_must_use(cx, &attrs[..], s.span);
757+
check_must_use(cx, &attrs[..], s.span)
757758
}
758759
}
759-
_ => {}
760-
}
760+
_ => false,
761+
};
761762
if !warned {
762763
cx.span_lint(UNUSED_RESULTS, s.span, "unused result");
763764
}

0 commit comments

Comments
 (0)