diff options
| -rw-r--r-- | compiler/rustc_ast_passes/src/ast_validation.rs | 19 | ||||
| -rw-r--r-- | compiler/rustc_ast_passes/src/errors.rs | 29 | ||||
| -rw-r--r-- | compiler/rustc_error_messages/locales/en-US/ast_passes.ftl | 15 |
3 files changed, 35 insertions, 28 deletions
diff --git a/compiler/rustc_ast_passes/src/ast_validation.rs b/compiler/rustc_ast_passes/src/ast_validation.rs index 3dd3cc537e6..1c3a4ab7c67 100644 --- a/compiler/rustc_ast_passes/src/ast_validation.rs +++ b/compiler/rustc_ast_passes/src/ast_validation.rs @@ -331,7 +331,7 @@ impl<'a> AstValidator<'a> { let max_num_args: usize = u16::MAX.into(); if fn_decl.inputs.len() > max_num_args { let Param { span, .. } = fn_decl.inputs[0]; - self.session.emit_err(TooManyParams { span, max_num_args }); + self.session.emit_err(FnParamTooMany { span, max_num_args }); } } @@ -339,13 +339,13 @@ impl<'a> AstValidator<'a> { match &*fn_decl.inputs { [Param { ty, span, .. }] => { if let TyKind::CVarArgs = ty.kind { - self.session.emit_err(CVarArgsIsSoleParam { span: *span }); + self.session.emit_err(FnParamCVarArgsOnly { span: *span }); } } [ps @ .., _] => { for Param { ty, span, .. } in ps { if let TyKind::CVarArgs = ty.kind { - self.session.emit_err(CVarArgsNotLast { span: *span }); + self.session.emit_err(FnParamCVarArgsNotLast { span: *span }); } } } @@ -372,9 +372,9 @@ impl<'a> AstValidator<'a> { }) .for_each(|attr| { if attr.is_doc_comment() { - self.session.emit_err(DocCommentOnFnParam { span: attr.span }); + self.session.emit_err(FnParamDocComment { span: attr.span }); } else { - self.session.emit_err(ForbiddenAttrOnFnParam { span: attr.span }); + self.session.emit_err(FnParamForbiddenAttr { span: attr.span }); } }); } @@ -382,14 +382,7 @@ impl<'a> AstValidator<'a> { fn check_decl_self_param(&self, fn_decl: &FnDecl, self_semantic: SelfSemantic) { if let (SelfSemantic::No, [param, ..]) = (self_semantic, &*fn_decl.inputs) { if param.is_self() { - self.err_handler() - .struct_span_err( - param.span, - "`self` parameter is only allowed in associated functions", - ) - .span_label(param.span, "not semantically valid as function parameter") - .note("associated functions are those in `impl` or `trait` definitions") - .emit(); + self.session.emit_err(FnParamForbiddenSelf { span: param.span }); } } } diff --git a/compiler/rustc_ast_passes/src/errors.rs b/compiler/rustc_ast_passes/src/errors.rs index d376f638bd2..ee375f1ced7 100644 --- a/compiler/rustc_ast_passes/src/errors.rs +++ b/compiler/rustc_ast_passes/src/errors.rs @@ -106,38 +106,47 @@ pub struct ForbiddenNonLifetimeParam { } #[derive(SessionDiagnostic)] -#[error(ast_passes::too_many_params)] -pub struct TooManyParams { +#[error(ast_passes::fn_param_too_many)] +pub struct FnParamTooMany { #[primary_span] pub span: Span, pub max_num_args: usize, } #[derive(SessionDiagnostic)] -#[error(ast_passes::c_var_args_is_sole_param)] -pub struct CVarArgsIsSoleParam { +#[error(ast_passes::fn_param_c_var_args_only)] +pub struct FnParamCVarArgsOnly { #[primary_span] pub span: Span, } #[derive(SessionDiagnostic)] -#[error(ast_passes::c_var_args_not_last)] -pub struct CVarArgsNotLast { +#[error(ast_passes::fn_param_c_var_args_not_last)] +pub struct FnParamCVarArgsNotLast { #[primary_span] pub span: Span, } #[derive(SessionDiagnostic)] -#[error(ast_passes::doc_comment_on_fn_param)] -pub struct DocCommentOnFnParam { +#[error(ast_passes::fn_param_doc_comment)] +pub struct FnParamDocComment { #[primary_span] #[label] pub span: Span, } #[derive(SessionDiagnostic)] -#[error(ast_passes::forbidden_attr_on_fn_param)] -pub struct ForbiddenAttrOnFnParam { +#[error(ast_passes::fn_param_forbidden_attr)] +pub struct FnParamForbiddenAttr { #[primary_span] pub span: Span, } + +#[derive(SessionDiagnostic)] +#[error(ast_passes::fn_param_forbidden_self)] +#[note] +pub struct FnParamForbiddenSelf { + #[primary_span] + #[label] + pub span: Span, +} diff --git a/compiler/rustc_error_messages/locales/en-US/ast_passes.ftl b/compiler/rustc_error_messages/locales/en-US/ast_passes.ftl index 49ef0cc83de..77826f639f4 100644 --- a/compiler/rustc_error_messages/locales/en-US/ast_passes.ftl +++ b/compiler/rustc_error_messages/locales/en-US/ast_passes.ftl @@ -38,18 +38,23 @@ ast_passes_forbidden_lifetime_bound = ast_passes_forbidden_non_lifetime_param = only lifetime parameters can be used in this context -ast_passes_too_many_params = +ast_passes_fn_param_too_many = function can not have more than {$max_num_args} arguments -ast_passes_c_var_args_is_sole_param = +ast_passes_fn_param_c_var_args_only = C-variadic function must be declared with at least one named argument -ast_passes_c_var_args_not_last = +ast_passes_fn_param_c_var_args_not_last = `...` must be the last argument of a C-variadic function -ast_passes_doc_comment_on_fn_param = +ast_passes_fn_param_doc_comment = documentation comments cannot be applied to function parameters .label = doc comments are not allowed here -ast_passes_forbidden_attr_on_fn_param = +ast_passes_fn_param_forbidden_attr = allow, cfg, cfg_attr, deny, expect, forbid, and warn are the only allowed built-in attributes in function parameters + +ast_passes_fn_param_forbidden_self = + `self` parameter is only allowed in associated functions + .label = not semantically valid as function parameter + .note = associated functions are those in `impl` or `trait` definitions |