bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

cfg taken out of Attributes, put in Item

Browse source 
check item.is_fake() instead of self_id.is_some()

Remove empty branching in Attributes::from_ast

diverse small refacto after Josha review

cfg computation moved in merge_attrs

refacto use from_ast twice for coherence

take cfg out of Attributes and move it to Item
This commit is contained in:
Timothée Delabrouille 2021-04-25 18:17:11 +02:00
parent b4f1dfd2c5
commit 727f9040aa
12 changed files with 104 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/librustdoc/html/render/mod.rs
View file

@ -608,17 +608,12 @@ fn document_item_info(
}
fn portability(item: &clean::Item, parent: Option<&clean::Item>) -> Option<String> {
let cfg = match (&item.attrs.cfg, parent.and_then(|p| p.attrs.cfg.as_ref())) {
let cfg = match (&item.cfg, parent.and_then(|p| p.cfg.as_ref())) {
(Some(cfg), Some(parent_cfg)) => cfg.simplify_with(parent_cfg),
(cfg, _) => cfg.as_deref().cloned(),
};
debug!(
"Portability {:?} - {:?} = {:?}",
item.attrs.cfg,
parent.and_then(|p| p.attrs.cfg.as_ref()),
cfg
);
debug!("Portability {:?} - {:?} = {:?}", item.cfg, parent.and_then(|p| p.cfg.as_ref()), cfg);
Some(format!("<div class=\"stab portability\">{}</div>", cfg?.render_long_html()))
}