summaryrefslogtreecommitdiffstats
path: root/compiler/rustc_error_messages/locales/en-US/metadata.ftl
diff options
context:
space:
mode:
Diffstat (limited to 'compiler/rustc_error_messages/locales/en-US/metadata.ftl')
-rw-r--r--compiler/rustc_error_messages/locales/en-US/metadata.ftl18
1 files changed, 17 insertions, 1 deletions
diff --git a/compiler/rustc_error_messages/locales/en-US/metadata.ftl b/compiler/rustc_error_messages/locales/en-US/metadata.ftl
index 08e553d9f..d1e1fd54d 100644
--- a/compiler/rustc_error_messages/locales/en-US/metadata.ftl
+++ b/compiler/rustc_error_messages/locales/en-US/metadata.ftl
@@ -150,12 +150,28 @@ metadata_no_multiple_global_alloc =
metadata_prev_global_alloc =
previous global allocator defined here
+metadata_no_multiple_alloc_error_handler =
+ cannot define multiple allocation error handlers
+ .label = cannot define a new allocation error handler
+
+metadata_prev_alloc_error_handler =
+ previous allocation error handler defined here
+
metadata_conflicting_global_alloc =
the `#[global_allocator]` in {$other_crate_name} conflicts with global allocator in: {$crate_name}
+metadata_conflicting_alloc_error_handler =
+ the `#[alloc_error_handler]` in {$other_crate_name} conflicts with allocation error handler in: {$crate_name}
+
metadata_global_alloc_required =
no global memory allocator found but one is required; link to std or add `#[global_allocator]` to a static item that implements the GlobalAlloc trait
+metadata_alloc_func_required =
+ `#[alloc_error_handler]` function required, but not found
+
+metadata_missing_alloc_error_handler =
+ use `#![feature(default_alloc_error_handler)]` for a default error handler
+
metadata_no_transitive_needs_dep =
the crate `{$crate_name}` cannot depend on a crate that needs {$needs_crate_name}, but it depends on `{$deps_crate_name}`
@@ -259,7 +275,7 @@ metadata_crate_location_unknown_type =
extern location for {$crate_name} is of an unknown type: {$path}
metadata_lib_filename_form =
- file name should be lib*.rlib or {dll_prefix}*.{dll_suffix}
+ file name should be lib*.rlib or {$dll_prefix}*{$dll_suffix}
metadata_multiple_import_name_type =
multiple `import_name_type` arguments in a single `#[link]` attribute