Skip to content

Commit fcc2f92

Browse files
committed
syntax: Return named errors from literal parsing functions
1 parent 85334c5 commit fcc2f92

File tree

6 files changed

+169
-131
lines changed

6 files changed

+169
-131
lines changed

src/libsyntax/attr/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ impl MetaItemKind {
554554
Some(TokenTree::Token(_, token::Eq)) => {
555555
tokens.next();
556556
return if let Some(TokenTree::Token(span, token)) = tokens.next() {
557-
Lit::from_token(&token, span, None).map(MetaItemKind::NameValue)
557+
Lit::from_token(&token, span).ok().map(MetaItemKind::NameValue)
558558
} else {
559559
None
560560
};
@@ -599,7 +599,7 @@ impl NestedMetaItem {
599599
where I: Iterator<Item = TokenTree>,
600600
{
601601
if let Some(TokenTree::Token(span, token)) = tokens.peek().cloned() {
602-
if let Some(lit) = Lit::from_token(&token, span, None) {
602+
if let Ok(lit) = Lit::from_token(&token, span) {
603603
tokens.next();
604604
return Some(NestedMetaItem::Literal(lit));
605605
}

0 commit comments

Comments
 (0)