bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rename Parser::span_diagnostic as Parser::dcx.

Browse source
This commit is contained in:
Nicholas Nethercote 2023-12-18 07:37:58 +11:00
parent 09af8a667c
commit 73bac456d4
8 changed files with 40 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compiler/rustc_parse/src/parser/nonterminal.rs
View file

@ -114,8 +114,9 @@ impl<'a> Parser<'a> {
NonterminalKind::Item => match self.parse_item(ForceCollect::Yes)? {
Some(item) => NtItem(item),
None => {
return Err(UnexpectedNonterminal::Item(self.token.span)
.into_diagnostic(self.diagnostic()));
return Err(
UnexpectedNonterminal::Item(self.token.span).into_diagnostic(self.dcx())
);
}
},
NonterminalKind::Block => {
@ -127,7 +128,7 @@ impl<'a> Parser<'a> {
Some(s) => NtStmt(P(s)),
None => {
return Err(UnexpectedNonterminal::Statement(self.token.span)
.into_diagnostic(self.diagnostic()));
.into_diagnostic(self.dcx()));
}
},
NonterminalKind::PatParam { .. } | NonterminalKind::PatWithOr => {
@ -163,7 +164,7 @@ impl<'a> Parser<'a> {
span: self.token.span,
token: self.token.clone(),
}
.into_diagnostic(self.diagnostic()));
.into_diagnostic(self.dcx()));
}
NonterminalKind::Path => {
NtPath(P(self.collect_tokens_no_attrs(|this| this.parse_path(PathStyle::Type))?))
@ -181,7 +182,7 @@ impl<'a> Parser<'a> {
span: self.token.span,
token: self.token.clone(),
}
.into_diagnostic(self.diagnostic()));
.into_diagnostic(self.dcx()));
}
}
};