File tree Expand file tree Collapse file tree 2 files changed +4
-4
lines changed Expand file tree Collapse file tree 2 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -90,11 +90,11 @@ impl Cfg {
90
90
},
91
91
MetaItemKind::List(ref items) => {
92
92
let orig_len = items.len();
93
- let sub_cfgs =
93
+ let mut sub_cfgs =
94
94
items.iter().filter_map(|i| Cfg::parse_nested(i, exclude).transpose());
95
95
let ret = match name {
96
- sym::all => sub_cfgs.fold(Ok( Cfg::True) , |x, y| Ok(x? & y?)),
97
- sym::any => sub_cfgs.fold(Ok( Cfg::False) , |x, y| Ok(x? | y?)),
96
+ sym::all => sub_cfgs.try_fold( Cfg::True, |x, y| Ok(x & y?)),
97
+ sym::any => sub_cfgs.try_fold( Cfg::False, |x, y| Ok(x | y?)),
98
98
sym::not => {
99
99
if orig_len == 1 {
100
100
let mut sub_cfgs = sub_cfgs.collect::<Vec<_>>();
Original file line number Diff line number Diff line change @@ -320,7 +320,7 @@ pub(crate) fn name_from_pat(p: &hir::Pat<'_>) -> Symbol {
320
320
);
321
321
return Symbol::intern("()");
322
322
}
323
- PatKind::Guard(p, _) => return name_from_pat(&* p),
323
+ PatKind::Guard(p, _) => return name_from_pat(p),
324
324
PatKind::Range(..) => return kw::Underscore,
325
325
PatKind::Slice(begin, ref mid, end) => {
326
326
let begin = begin.iter().map(|p| name_from_pat(p).to_string());
You can’t perform that action at this time.
0 commit comments