Skip to content

Commit

Permalink
Auto merge of #115728 - chenyukang:yukang-fix-diag-generic-parameters…
Browse files Browse the repository at this point in the history
…, r=cjgillot

Cleanup unused labels in messages.ftl

These labels were not used, maybe because we removed the diagnostics but forgot them.
  • Loading branch information
bors committed Sep 12, 2023
2 parents cc7a9d6 + f9a9ff2 commit 5f6ee65
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 20 deletions.
4 changes: 0 additions & 4 deletions compiler/rustc_ast_lowering/messages.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@ ast_lowering_bad_return_type_notation_inputs =
argument types not allowed with return type notation
.suggestion = remove the input types
ast_lowering_bad_return_type_notation_needs_dots =
return type notation arguments must be elided with `..`
.suggestion = add `..`
ast_lowering_bad_return_type_notation_output =
return type not allowed with return type notation
.suggestion = remove the return type
Expand Down
9 changes: 0 additions & 9 deletions compiler/rustc_borrowck/messages.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,6 @@ borrowck_higher_ranked_subtype_error =
borrowck_lifetime_constraints_error =
lifetime may not live long enough
borrowck_move_borrowed =
cannot move out of `{$desc}` because it is borrowed
borrowck_move_out_place_here =
{$place} is moved here
Expand Down Expand Up @@ -250,12 +247,6 @@ borrowck_var_move_by_use_in_closure =
borrowck_var_move_by_use_in_generator =
move occurs due to use in generator
borrowck_var_move_by_use_place_in_closure =
move occurs due to use of {$place} in closure
borrowck_var_move_by_use_place_in_generator =
move occurs due to use of {$place} in generator
borrowck_var_mutable_borrow_by_use_place_in_closure =
mutable borrow occurs due to use of {$place} in closure
Expand Down
3 changes: 0 additions & 3 deletions compiler/rustc_metadata/messages.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -259,9 +259,6 @@ metadata_std_required =
metadata_symbol_conflicts_current =
the current crate is indistinguishable from one of its dependencies: it has the same crate-name `{$crate_name}` and was compiled with the same `-C metadata` arguments. This will result in symbol conflicts between the two.
metadata_symbol_conflicts_others =
found two different crates with name `{$crate_name}` that are not distinguished by differing `-C metadata`. This will result in symbol conflicts between the two.
metadata_target_no_std_support =
the `{$locator_triple}` target may not support the standard library
Expand Down
4 changes: 0 additions & 4 deletions compiler/rustc_passes/messages.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,6 @@ passes_collapse_debuginfo =
passes_confusables = attribute should be applied to an inherent method
.label = not an inherent method
passes_const_impl_const_trait =
const `impl`s must be for traits marked with `#[const_trait]`
.note = this trait must be annotated with `#[const_trait]`
passes_continue_labeled_block =
`continue` pointing to a labeled block
.label = labeled blocks cannot be `continue`'d
Expand Down

0 comments on commit 5f6ee65

Please sign in to comment.