bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

More clean up

Browse source
This commit is contained in:
Guillaume Gomez 2022-01-20 22:13:32 +01:00
parent caec4a23f2
commit b0df7653d0
2 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/librustdoc/clean/cfg.rs
View file

@ -87,11 +87,8 @@ impl Cfg {
}), }),
}, },
MetaItemKind::List(ref items) => { MetaItemKind::List(ref items) => {
let sub_cfgs = items.iter().filter_map(|i| match Cfg::parse_nested(i, exclude) { let sub_cfgs =
Ok(Some(c)) => Some(Ok(c)), items.iter().filter_map(|i| Cfg::parse_nested(i, exclude).transpose());
Err(e) => Some(Err(e)),
_ => None,
});
let ret = match name { let ret = match name {
sym::all => sub_cfgs.fold(Ok(Cfg::True), |x, y| Ok(x? & y?)), sym::all => sub_cfgs.fold(Ok(Cfg::True), |x, y| Ok(x? & y?)),
sym::any => sub_cfgs.fold(Ok(Cfg::False), |x, y| Ok(x? | y?)), sym::any => sub_cfgs.fold(Ok(Cfg::False), |x, y| Ok(x? | y?)),

5
src/librustdoc/clean/types.rs
View file

@ -831,9 +831,8 @@ impl AttributesExt for [ast::Attribute] {
self.iter() self.iter()
.filter(|attr| attr.has_name(sym::cfg)) .filter(|attr| attr.has_name(sym::cfg))
.filter_map(|attr| single(attr.meta_item_list()?)) .filter_map(|attr| single(attr.meta_item_list()?))
.filter_map(|attr| match Cfg::parse_without(attr.meta_item()?, hidden_cfg) { .filter_map(|attr| {
Ok(Some(c)) => Some(c), Cfg::parse_without(attr.meta_item()?, hidden_cfg).ok().flatten()
_ => None,
}) })
.fold(Cfg::True, |cfg, new_cfg| cfg & new_cfg) .fold(Cfg::True, |cfg, new_cfg| cfg & new_cfg)
} else { } else {