bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Stop flagging certain inner attrs as outer ones

Browse source
This commit is contained in:
León Orell Valerian Liehr 2022-03-22 00:36:47 +01:00
parent 201cf3dba3
commit 5ab0548500
7 changed files with 54 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compiler/rustc_builtin_macros/src/source_util.rs
View file

@ -141,7 +141,7 @@ pub fn expand_include<'cx>(
fn make_items(mut self: Box<ExpandResult<'a>>) -> Option<SmallVec<[P<ast::Item>; 1]>> {
let mut ret = SmallVec::new();
while self.p.token != token::Eof {
loop {
match self.p.parse_item(ForceCollect::No) {
Err(mut err) => {
err.emit();
@ -149,9 +149,12 @@ pub fn expand_include<'cx>(
}
Ok(Some(item)) => ret.push(item),
Ok(None) => {
let token = pprust::token_to_string(&self.p.token);
let msg = format!("expected item, found `{}`", token);
self.p.struct_span_err(self.p.token.span, &msg).emit();
if self.p.token != token::Eof {
let token = pprust::token_to_string(&self.p.token);
let msg = format!("expected item, found `{}`", token);
self.p.struct_span_err(self.p.token.span, &msg).emit();
}
break;
}
}