File tree Expand file tree Collapse file tree 2 files changed +8
-7
lines changed
branches/auto/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 @@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
10
10
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
11
11
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
12
12
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13
- refs/heads/auto: 2a37f7f07ca6bc3e3f19c6bb33b25bbc35f561a2
13
+ refs/heads/auto: f38b83b3609b060df5ab3d2a57e98020b8b29efb
14
14
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
15
15
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
16
16
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
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