bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Created NestedMetaItem::name_value_literal_span method

Browse source
This commit is contained in:
Guillaume Gomez 2020-11-28 16:11:25 +01:00
parent 0fa9d31c41
commit 7df0052df8
4 changed files with 22 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compiler/rustc_expand/src/expand.rs
View file

@ -1603,23 +1603,22 @@ impl<'a, 'b> MutVisitor for InvocationCollector<'a, 'b> {
items.push(ast::NestedMetaItem::MetaItem(item));
}
Err(e) => {
let lit =
it.meta_item().and_then(|item| item.name_value_literal()).unwrap();
let lit_span = it.name_value_literal_span().unwrap();
if e.kind() == ErrorKind::InvalidData {
self.cx
.struct_span_err(
lit.span,
lit_span,
&format!("{} wasn't a utf-8 file", filename.display()),
)
.span_label(lit.span, "contains invalid utf-8")
.span_label(lit_span, "contains invalid utf-8")
.emit();
} else {
let mut err = self.cx.struct_span_err(
lit.span,
lit_span,
&format!("couldn't read {}: {}", filename.display(), e),
);
err.span_label(lit.span, "couldn't read file");
err.span_label(lit_span, "couldn't read file");
err.emit();
}