bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

errors: rename typeck.ftl to hir_analysis.ftl

Browse source 
In #102306, `rustc_typeck` was renamed to `rustc_hir_analysis` but the
diagnostic resources were not renamed - which is what this commit
changes.

Signed-off-by: David Wood <david.wood@huawei.com>
This commit is contained in:
David Wood 2022-09-28 10:21:33 +01:00
parent 6b139c5b3e
commit c4418e1940
9 changed files with 326 additions and 319 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/rustc_error_messages/locales/en-US/compiletest.ftl Normal file
View file

@ -0,0 +1,5 @@
compiletest_example = this is an example message used in testing
.note = with a note
.help = with a help
.suggestion = with a suggestion
.label = with a label

64
compiler/rustc_error_messages/locales/en-US/typeck.ftl → compiler/rustc_error_messages/locales/en-US/hir_analysis.ftl
View file

@ -1,101 +1,101 @@
typeck_field_multiply_specified_in_initializer =
hir_analysis_field_multiply_specified_in_initializer =
field `{$ident}` specified more than once
.label = used more than once
.previous_use_label = first use of `{$ident}`
typeck_unrecognized_atomic_operation =
hir_analysis_unrecognized_atomic_operation =
unrecognized atomic operation function: `{$op}`
.label = unrecognized atomic operation
typeck_wrong_number_of_generic_arguments_to_intrinsic =
hir_analysis_wrong_number_of_generic_arguments_to_intrinsic =
intrinsic has wrong number of {$descr} parameters: found {$found}, expected {$expected}
.label = expected {$expected} {$descr} {$expected ->
[one] parameter
*[other] parameters
}
typeck_unrecognized_intrinsic_function =
hir_analysis_unrecognized_intrinsic_function =
unrecognized intrinsic function: `{$name}`
.label = unrecognized intrinsic
typeck_lifetimes_or_bounds_mismatch_on_trait =
hir_analysis_lifetimes_or_bounds_mismatch_on_trait =
lifetime parameters or bounds on {$item_kind} `{$ident}` do not match the trait declaration
.label = lifetimes do not match {$item_kind} in trait
.generics_label = lifetimes in impl do not match this {$item_kind} in trait
typeck_drop_impl_on_wrong_item =
hir_analysis_drop_impl_on_wrong_item =
the `Drop` trait may only be implemented for local structs, enums, and unions
.label = must be a struct, enum, or union in the current crate
typeck_field_already_declared =
hir_analysis_field_already_declared =
field `{$field_name}` is already declared
.label = field already declared
.previous_decl_label = `{$field_name}` first declared here
typeck_copy_impl_on_type_with_dtor =
hir_analysis_copy_impl_on_type_with_dtor =
the trait `Copy` may not be implemented for this type; the type has a destructor
.label = `Copy` not allowed on types with destructors
typeck_multiple_relaxed_default_bounds =
hir_analysis_multiple_relaxed_default_bounds =
type parameter has more than one relaxed default bound, only one is supported
typeck_copy_impl_on_non_adt =
hir_analysis_copy_impl_on_non_adt =
the trait `Copy` may not be implemented for this type
.label = type is not a structure or enumeration
typeck_trait_object_declared_with_no_traits =
hir_analysis_trait_object_declared_with_no_traits =
at least one trait is required for an object type
.alias_span = this alias does not contain a trait
typeck_ambiguous_lifetime_bound =
hir_analysis_ambiguous_lifetime_bound =
ambiguous lifetime bound, explicit lifetime bound required
typeck_assoc_type_binding_not_allowed =
hir_analysis_assoc_type_binding_not_allowed =
associated type bindings are not allowed here
.label = associated type not allowed here
typeck_functional_record_update_on_non_struct =
hir_analysis_functional_record_update_on_non_struct =
functional record update syntax requires a struct
typeck_typeof_reserved_keyword_used =
hir_analysis_typeof_reserved_keyword_used =
`typeof` is a reserved keyword but unimplemented
.suggestion = consider replacing `typeof(...)` with an actual type
.label = reserved keyword
typeck_return_stmt_outside_of_fn_body =
hir_analysis_return_stmt_outside_of_fn_body =
return statement outside of function body
.encl_body_label = the return is part of this body...
.encl_fn_label = ...not the enclosing function body
typeck_yield_expr_outside_of_generator =
hir_analysis_yield_expr_outside_of_generator =
yield expression outside of generator literal
typeck_struct_expr_non_exhaustive =
hir_analysis_struct_expr_non_exhaustive =
cannot create non-exhaustive {$what} using struct expression
typeck_method_call_on_unknown_type =
hir_analysis_method_call_on_unknown_type =
the type of this value must be known to call a method on a raw pointer on it
typeck_value_of_associated_struct_already_specified =
hir_analysis_value_of_associated_struct_already_specified =
the value of the associated type `{$item_name}` (from trait `{$def_path}`) is already specified
.label = re-bound here
.previous_bound_label = `{$item_name}` bound here first
typeck_address_of_temporary_taken = cannot take address of a temporary
hir_analysis_address_of_temporary_taken = cannot take address of a temporary
.label = temporary value
typeck_add_return_type_add = try adding a return type
hir_analysis_add_return_type_add = try adding a return type
typeck_add_return_type_missing_here = a return type might be missing here
hir_analysis_add_return_type_missing_here = a return type might be missing here
typeck_expected_default_return_type = expected `()` because of default return type
hir_analysis_expected_default_return_type = expected `()` because of default return type
typeck_expected_return_type = expected `{$expected}` because of return type
hir_analysis_expected_return_type = expected `{$expected}` because of return type
typeck_unconstrained_opaque_type = unconstrained opaque type
hir_analysis_unconstrained_opaque_type = unconstrained opaque type
.note = `{$name}` must be used in combination with a concrete type within the same module
typeck_missing_type_params =
hir_analysis_missing_type_params =
the type {$parameterCount ->
[one] parameter
*[other] parameters
@ -117,19 +117,19 @@ typeck_missing_type_params =
} to {$parameters}
.note = because of the default `Self` reference, type parameters must be specified on object types
typeck_manual_implementation =
hir_analysis_manual_implementation =
manual implementations of `{$trait_name}` are experimental
.label = manual implementations of `{$trait_name}` are experimental
.help = add `#![feature(unboxed_closures)]` to the crate attributes to enable
typeck_substs_on_overridden_impl = could not resolve substs on overridden impl
hir_analysis_substs_on_overridden_impl = could not resolve substs on overridden impl
typeck_unused_extern_crate =
hir_analysis_unused_extern_crate =
unused extern crate
.suggestion = remove it
typeck_extern_crate_not_idiomatic =
hir_analysis_extern_crate_not_idiomatic =
`extern crate` is not idiomatic in the new edition
.suggestion = convert it to a `{$msg_code}`
typeck_expected_used_symbol = expected `used`, `used(compiler)` or `used(linker)`
hir_analysis_expected_used_symbol = expected `used`, `used(compiler)` or `used(linker)`

17
compiler/rustc_error_messages/src/lib.rs
View file

@ -40,28 +40,29 @@ fluent_messages! {
attr => "../locales/en-US/attr.ftl",
borrowck => "../locales/en-US/borrowck.ftl",
builtin_macros => "../locales/en-US/builtin_macros.ftl",
compiletest => "../locales/en-US/compiletest.ftl",
const_eval => "../locales/en-US/const_eval.ftl",
codegen_gcc => "../locales/en-US/codegen_gcc.ftl",
driver => "../locales/en-US/driver.ftl",
expand => "../locales/en-US/expand.ftl",
session => "../locales/en-US/session.ftl",
interface => "../locales/en-US/interface.ftl",
hir_analysis => "../locales/en-US/hir_analysis.ftl",
infer => "../locales/en-US/infer.ftl",
interface => "../locales/en-US/interface.ftl",
lint => "../locales/en-US/lint.ftl",
middle => "../locales/en-US/middle.ftl",
monomorphize => "../locales/en-US/monomorphize.ftl",
metadata => "../locales/en-US/metadata.ftl",
middle => "../locales/en-US/middle.ftl",
mir_dataflow => "../locales/en-US/mir_dataflow.ftl",
monomorphize => "../locales/en-US/monomorphize.ftl",
parser => "../locales/en-US/parser.ftl",
passes => "../locales/en-US/passes.ftl",
plugin_impl => "../locales/en-US/plugin_impl.ftl",
privacy => "../locales/en-US/privacy.ftl",
query_system => "../locales/en-US/query_system.ftl",
trait_selection => "../locales/en-US/trait_selection.ftl",
save_analysis => "../locales/en-US/save_analysis.ftl",
ty_utils => "../locales/en-US/ty_utils.ftl",
typeck => "../locales/en-US/typeck.ftl",
mir_dataflow => "../locales/en-US/mir_dataflow.ftl",
session => "../locales/en-US/session.ftl",
symbol_mangling => "../locales/en-US/symbol_mangling.ftl",
trait_selection => "../locales/en-US/trait_selection.ftl",
ty_utils => "../locales/en-US/ty_utils.ftl",
}
pub use fluent_generated::{self as fluent, DEFAULT_LOCALE_RESOURCES};