bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix an ICE parsing a malformed attribute.

Browse source 
Fixes #104620.
This commit is contained in:
Nicholas Nethercote 2022-11-22 16:48:42 +11:00
parent e221616639
commit 7c3f631ddf
3 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_ast/src/attr/mod.rs
View file

@ -618,9 +618,12 @@ impl MetaItemKind {
}) => MetaItemKind::list_from_tokens(tokens.clone()),
AttrArgs::Delimited(..) => None,
AttrArgs::Eq(_, AttrArgsEq::Ast(expr)) => match expr.kind {
ast::ExprKind::Lit(token_lit) => Some(MetaItemKind::NameValue(
Lit::from_token_lit(token_lit, expr.span).expect("token_lit in from_attr_args"),
)),
ast::ExprKind::Lit(token_lit) => {
// Turn failures to `None`, we'll get parse errors elsewhere.
Lit::from_token_lit(token_lit, expr.span)
.ok()
.map(|lit| MetaItemKind::NameValue(lit))
}
_ => None,
},
AttrArgs::Eq(_, AttrArgsEq::Hir(lit)) => Some(MetaItemKind::NameValue(lit.clone())),