bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Migrate builtin-macros-expected-one-cfg-pattern to SessionDiagnostic

Browse source
This commit is contained in:
beetrees 2022-06-21 20:20:00 +01:00
parent 6264ffbfef
commit be5337cde5
No known key found for this signature in database
GPG key ID: 8791BD754191EBD6
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_builtin_macros/src/cfg.rs
View file

@ -43,6 +43,13 @@ struct RequiresCfgPattern {
span: Span, span: Span,
} }
#[derive(SessionDiagnostic)]
#[error(slug = "builtin-macros-expected-one-cfg-pattern")]
struct OneCfgPattern {
#[primary_span]
span: Span,
}
fn parse_cfg<'a>(cx: &mut ExtCtxt<'a>, span: Span, tts: TokenStream) -> PResult<'a, ast::MetaItem> { fn parse_cfg<'a>(cx: &mut ExtCtxt<'a>, span: Span, tts: TokenStream) -> PResult<'a, ast::MetaItem> {
let mut p = cx.new_parser_from_tts(tts); let mut p = cx.new_parser_from_tts(tts);
@ -55,7 +62,7 @@ fn parse_cfg<'a>(cx: &mut ExtCtxt<'a>, span: Span, tts: TokenStream) -> PResult<
let _ = p.eat(&token::Comma); let _ = p.eat(&token::Comma);
if !p.eat(&token::Eof) { if !p.eat(&token::Eof) {
return Err(cx.struct_span_err(span, "expected 1 cfg-pattern")); return Err(cx.create_err(OneCfgPattern { span }));
} }
Ok(cfg) Ok(cfg)

2
compiler/rustc_error_messages/locales/en-US/builtin_macros.ftl
View file

@ -1,3 +1,5 @@
builtin-macros-requires-cfg-pattern = builtin-macros-requires-cfg-pattern =
macro requires a cfg-pattern as an argument macro requires a cfg-pattern as an argument
.label = cfg-pattern required .label = cfg-pattern required
builtin-macros-expected-one-cfg-pattern = expected 1 cfg-pattern