File tree Expand file tree Collapse file tree 2 files changed +8
-7
lines changed
branches/try/src/librustc_lint Expand file tree Collapse file tree 2 files changed +8
-7
lines changed Original file line number Diff line number Diff line change 2
2
refs/heads/master: 38e97b99a6b133cb4c621c68e75b28abc6c617c1
3
3
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4
4
refs/heads/snap-stage3: 3a96d6a9818fe2affc98a187fb1065120458cee9
5
- refs/heads/try: 2a37f7f07ca6bc3e3f19c6bb33b25bbc35f561a2
5
+ refs/heads/try: f38b83b3609b060df5ab3d2a57e98020b8b29efb
6
6
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
7
7
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
8
8
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
Original file line number Diff line number Diff line change @@ -741,23 +741,24 @@ impl LintPass for UnusedResults {
741
741
}
742
742
743
743
let t = ty:: expr_ty ( cx. tcx , expr) ;
744
- let mut warned = false ;
745
- match t. sty {
744
+ let warned = match t. sty {
746
745
ty:: ty_tup( ref tys) if tys. is_empty ( ) => return ,
747
746
ty:: ty_bool => return ,
748
747
ty:: ty_struct( did, _) |
749
748
ty:: ty_enum( did, _) => {
750
749
if ast_util:: is_local ( did) {
751
750
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
753
754
}
754
755
} else {
755
756
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 )
757
758
}
758
759
}
759
- _ => { }
760
- }
760
+ _ => false ,
761
+ } ;
761
762
if !warned {
762
763
cx. span_lint ( UNUSED_RESULTS , s. span , "unused result" ) ;
763
764
}
You can’t perform that action at this time.
0 commit comments