-//! Errors emitted by typeck.
+//! Errors emitted by `hir_analysis`.
+
use rustc_errors::IntoDiagnostic;
use rustc_errors::{error_code, Applicability, DiagnosticBuilder, ErrorGuaranteed, Handler};
use rustc_macros::{Diagnostic, LintDiagnostic, Subdiagnostic};
use rustc_span::{symbol::Ident, Span, Symbol};
#[derive(Diagnostic)]
-#[diag(typeck::field_multiply_specified_in_initializer, code = "E0062")]
+#[diag(hir_analysis::field_multiply_specified_in_initializer, code = "E0062")]
pub struct FieldMultiplySpecifiedInInitializer {
#[primary_span]
#[label]
pub span: Span,
- #[label(typeck::previous_use_label)]
+ #[label(hir_analysis::previous_use_label)]
pub prev_span: Span,
pub ident: Ident,
}
#[derive(Diagnostic)]
-#[diag(typeck::unrecognized_atomic_operation, code = "E0092")]
+#[diag(hir_analysis::unrecognized_atomic_operation, code = "E0092")]
pub struct UnrecognizedAtomicOperation<'a> {
#[primary_span]
#[label]
}
#[derive(Diagnostic)]
-#[diag(typeck::wrong_number_of_generic_arguments_to_intrinsic, code = "E0094")]
+#[diag(hir_analysis::wrong_number_of_generic_arguments_to_intrinsic, code = "E0094")]
pub struct WrongNumberOfGenericArgumentsToIntrinsic<'a> {
#[primary_span]
#[label]
}
#[derive(Diagnostic)]
-#[diag(typeck::unrecognized_intrinsic_function, code = "E0093")]
+#[diag(hir_analysis::unrecognized_intrinsic_function, code = "E0093")]
pub struct UnrecognizedIntrinsicFunction {
#[primary_span]
#[label]
}
#[derive(Diagnostic)]
-#[diag(typeck::lifetimes_or_bounds_mismatch_on_trait, code = "E0195")]
+#[diag(hir_analysis::lifetimes_or_bounds_mismatch_on_trait, code = "E0195")]
pub struct LifetimesOrBoundsMismatchOnTrait {
#[primary_span]
#[label]
pub span: Span,
- #[label(typeck::generics_label)]
+ #[label(hir_analysis::generics_label)]
pub generics_span: Option<Span>,
pub item_kind: &'static str,
pub ident: Ident,
}
#[derive(Diagnostic)]
-#[diag(typeck::drop_impl_on_wrong_item, code = "E0120")]
+#[diag(hir_analysis::drop_impl_on_wrong_item, code = "E0120")]
pub struct DropImplOnWrongItem {
#[primary_span]
#[label]
}
#[derive(Diagnostic)]
-#[diag(typeck::field_already_declared, code = "E0124")]
+#[diag(hir_analysis::field_already_declared, code = "E0124")]
pub struct FieldAlreadyDeclared {
pub field_name: Ident,
#[primary_span]
#[label]
pub span: Span,
- #[label(typeck::previous_decl_label)]
+ #[label(hir_analysis::previous_decl_label)]
pub prev_span: Span,
}
#[derive(Diagnostic)]
-#[diag(typeck::copy_impl_on_type_with_dtor, code = "E0184")]
+#[diag(hir_analysis::copy_impl_on_type_with_dtor, code = "E0184")]
pub struct CopyImplOnTypeWithDtor {
#[primary_span]
#[label]
}
#[derive(Diagnostic)]
-#[diag(typeck::multiple_relaxed_default_bounds, code = "E0203")]
+#[diag(hir_analysis::multiple_relaxed_default_bounds, code = "E0203")]
pub struct MultipleRelaxedDefaultBounds {
#[primary_span]
pub span: Span,
}
#[derive(Diagnostic)]
-#[diag(typeck::copy_impl_on_non_adt, code = "E0206")]
+#[diag(hir_analysis::copy_impl_on_non_adt, code = "E0206")]
pub struct CopyImplOnNonAdt {
#[primary_span]
#[label]
}
#[derive(Diagnostic)]
-#[diag(typeck::trait_object_declared_with_no_traits, code = "E0224")]
+#[diag(hir_analysis::trait_object_declared_with_no_traits, code = "E0224")]
pub struct TraitObjectDeclaredWithNoTraits {
#[primary_span]
pub span: Span,
- #[label(typeck::alias_span)]
+ #[label(hir_analysis::alias_span)]
pub trait_alias_span: Option<Span>,
}
#[derive(Diagnostic)]
-#[diag(typeck::ambiguous_lifetime_bound, code = "E0227")]
+#[diag(hir_analysis::ambiguous_lifetime_bound, code = "E0227")]
pub struct AmbiguousLifetimeBound {
#[primary_span]
pub span: Span,
}
#[derive(Diagnostic)]
-#[diag(typeck::assoc_type_binding_not_allowed, code = "E0229")]
+#[diag(hir_analysis::assoc_type_binding_not_allowed, code = "E0229")]
pub struct AssocTypeBindingNotAllowed {
#[primary_span]
#[label]
}
#[derive(Diagnostic)]
-#[diag(typeck::functional_record_update_on_non_struct, code = "E0436")]
+#[diag(hir_analysis::functional_record_update_on_non_struct, code = "E0436")]
pub struct FunctionalRecordUpdateOnNonStruct {
#[primary_span]
pub span: Span,
}
#[derive(Diagnostic)]
-#[diag(typeck::typeof_reserved_keyword_used, code = "E0516")]
+#[diag(hir_analysis::typeof_reserved_keyword_used, code = "E0516")]
pub struct TypeofReservedKeywordUsed<'tcx> {
pub ty: Ty<'tcx>,
#[primary_span]
}
#[derive(Diagnostic)]
-#[diag(typeck::return_stmt_outside_of_fn_body, code = "E0572")]
+#[diag(hir_analysis::return_stmt_outside_of_fn_body, code = "E0572")]
pub struct ReturnStmtOutsideOfFnBody {
#[primary_span]
pub span: Span,
- #[label(typeck::encl_body_label)]
+ #[label(hir_analysis::encl_body_label)]
pub encl_body_span: Option<Span>,
- #[label(typeck::encl_fn_label)]
+ #[label(hir_analysis::encl_fn_label)]
pub encl_fn_span: Option<Span>,
}
#[derive(Diagnostic)]
-#[diag(typeck::yield_expr_outside_of_generator, code = "E0627")]
+#[diag(hir_analysis::yield_expr_outside_of_generator, code = "E0627")]
pub struct YieldExprOutsideOfGenerator {
#[primary_span]
pub span: Span,
}
#[derive(Diagnostic)]
-#[diag(typeck::struct_expr_non_exhaustive, code = "E0639")]
+#[diag(hir_analysis::struct_expr_non_exhaustive, code = "E0639")]
pub struct StructExprNonExhaustive {
#[primary_span]
pub span: Span,
}
#[derive(Diagnostic)]
-#[diag(typeck::method_call_on_unknown_type, code = "E0699")]
+#[diag(hir_analysis::method_call_on_unknown_type, code = "E0699")]
pub struct MethodCallOnUnknownType {
#[primary_span]
pub span: Span,
}
#[derive(Diagnostic)]
-#[diag(typeck::value_of_associated_struct_already_specified, code = "E0719")]
+#[diag(hir_analysis::value_of_associated_struct_already_specified, code = "E0719")]
pub struct ValueOfAssociatedStructAlreadySpecified {
#[primary_span]
#[label]
pub span: Span,
- #[label(typeck::previous_bound_label)]
+ #[label(hir_analysis::previous_bound_label)]
pub prev_span: Span,
pub item_name: Ident,
pub def_path: String,
}
#[derive(Diagnostic)]
-#[diag(typeck::address_of_temporary_taken, code = "E0745")]
+#[diag(hir_analysis::address_of_temporary_taken, code = "E0745")]
pub struct AddressOfTemporaryTaken {
#[primary_span]
#[label]
#[derive(Subdiagnostic)]
pub enum AddReturnTypeSuggestion {
#[suggestion(
- typeck::add_return_type_add,
+ hir_analysis::add_return_type_add,
code = "-> {found} ",
applicability = "machine-applicable"
)]
found: String,
},
#[suggestion(
- typeck::add_return_type_missing_here,
+ hir_analysis::add_return_type_missing_here,
code = "-> _ ",
applicability = "has-placeholders"
)]
#[derive(Subdiagnostic)]
pub enum ExpectedReturnTypeLabel<'tcx> {
- #[label(typeck::expected_default_return_type)]
+ #[label(hir_analysis::expected_default_return_type)]
Unit {
#[primary_span]
span: Span,
},
- #[label(typeck::expected_return_type)]
+ #[label(hir_analysis::expected_return_type)]
Other {
#[primary_span]
span: Span,
}
#[derive(Diagnostic)]
-#[diag(typeck::unconstrained_opaque_type)]
+#[diag(hir_analysis::unconstrained_opaque_type)]
#[note]
pub struct UnconstrainedOpaqueType {
#[primary_span]
fn into_diagnostic(self, handler: &'a Handler) -> DiagnosticBuilder<'a, ErrorGuaranteed> {
let mut err = handler.struct_span_err_with_code(
self.span,
- rustc_errors::fluent::typeck::missing_type_params,
+ rustc_errors::fluent::hir_analysis::missing_type_params,
error_code!(E0393),
);
err.set_arg("parameterCount", self.missing_type_params.len());
.join(", "),
);
- err.span_label(self.def_span, rustc_errors::fluent::typeck::label);
+ err.span_label(self.def_span, rustc_errors::fluent::hir_analysis::label);
let mut suggested = false;
// Don't suggest setting the type params if there are some already: the order is
// least we can clue them to the correct syntax `Iterator<Type>`.
err.span_suggestion(
self.span,
- rustc_errors::fluent::typeck::suggestion,
+ rustc_errors::fluent::hir_analysis::suggestion,
format!(
"{}<{}>",
snippet,
}
}
if !suggested {
- err.span_label(self.span, rustc_errors::fluent::typeck::no_suggestion_label);
+ err.span_label(self.span, rustc_errors::fluent::hir_analysis::no_suggestion_label);
}
- err.note(rustc_errors::fluent::typeck::note);
+ err.note(rustc_errors::fluent::hir_analysis::note);
err
}
}
#[derive(Diagnostic)]
-#[diag(typeck::manual_implementation, code = "E0183")]
+#[diag(hir_analysis::manual_implementation, code = "E0183")]
#[help]
pub struct ManualImplementation {
#[primary_span]
}
#[derive(Diagnostic)]
-#[diag(typeck::substs_on_overridden_impl)]
+#[diag(hir_analysis::substs_on_overridden_impl)]
pub struct SubstsOnOverriddenImpl {
#[primary_span]
pub span: Span,
}
#[derive(LintDiagnostic)]
-#[diag(typeck::unused_extern_crate)]
+#[diag(hir_analysis::unused_extern_crate)]
pub struct UnusedExternCrate {
#[suggestion(applicability = "machine-applicable", code = "")]
pub span: Span,
}
#[derive(LintDiagnostic)]
-#[diag(typeck::extern_crate_not_idiomatic)]
+#[diag(hir_analysis::extern_crate_not_idiomatic)]
pub struct ExternCrateNotIdiomatic {
#[suggestion_short(applicability = "machine-applicable", code = "{suggestion_code}")]
pub span: Span,
}
#[derive(Diagnostic)]
-#[diag(typeck::expected_used_symbol)]
+#[diag(hir_analysis::expected_used_symbol)]
pub struct ExpectedUsedSymbol {
#[primary_span]
pub span: Span,
}
+
+#[derive(Diagnostic)]
+#[diag(hir_analysis::missing_parentheses_in_range, code = "E0689")]
+pub struct MissingParentheseInRange {
+ #[primary_span]
+ #[label(hir_analysis::missing_parentheses_in_range)]
+ pub span: Span,
+ pub ty_str: String,
+ pub method_name: String,
+
+ #[subdiagnostic]
+ pub add_missing_parentheses: Option<AddMissingParenthesesInRange>,
+}
+
+#[derive(Subdiagnostic)]
+#[multipart_suggestion_verbose(
+ hir_analysis::add_missing_parentheses_in_range,
+ applicability = "maybe-incorrect"
+)]
+pub struct AddMissingParenthesesInRange {
+ pub func_name: String,
+ #[suggestion_part(code = "(")]
+ pub left: Span,
+ #[suggestion_part(code = ")")]
+ pub right: Span,
+}
projects / rust.git / blobdiff