mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix parsing of active cfg_attr

Browse source
This commit is contained in:
Jonas Schievink 2020-12-18 20:00:59 +01:00
parent 08de1b4fa5
commit d42d1d33f0
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/hir_def/src/attr.rs
View file

@ -167,6 +167,7 @@ impl RawAttrs {
}); });
cfg.pop(); // `,` ends up in here cfg.pop(); // `,` ends up in here
let attr = Subtree { delimiter: None, token_trees: attr };
let cfg = Subtree { delimiter: subtree.delimiter, token_trees: cfg }; let cfg = Subtree { delimiter: subtree.delimiter, token_trees: cfg };
let cfg = CfgExpr::parse(&cfg); let cfg = CfgExpr::parse(&cfg);
@ -174,8 +175,7 @@ impl RawAttrs {
if cfg_options.check(&cfg) == Some(false) { if cfg_options.check(&cfg) == Some(false) {
None None
} else { } else {
let attr = Subtree { delimiter: None, token_trees: attr }; let attr = ast::Attr::parse(&format!("#[{}]", attr)).ok()?;
let attr = ast::Attr::parse(&attr.to_string()).ok()?;
let hygiene = Hygiene::new_unhygienic(); // FIXME let hygiene = Hygiene::new_unhygienic(); // FIXME
Attr::from_src(attr, &hygiene) Attr::from_src(attr, &hygiene)
} }