Skip to content

Commit 6a207f4

Browse files
borsbors
committedJun 11, 2024
Auto merge of #126262 - jieyouxu:rollup-g29lo3c, r=jieyouxu
Rollup of 5 pull requests Successful merges: - #125913 (Spruce up the diagnostics of some early lints) - #126234 (Delegation: fix ICE on late diagnostics) - #126253 (Simplify assert matchers in `run-make-support`) - #126257 (Rename `needs-matching-clang` to `needs-force-clang-based-tests`) - #126259 (reachable computation: clarify comments around consts) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 336e6ab + 36c884c commit 6a207f4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+156
-80
lines changed
 

‎compiler/rustc_expand/messages.ftl

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ expand_unsupported_key_value =
157157
key-value macro attributes are not supported
158158
159159
expand_var_still_repeating =
160-
variable '{$ident}' is still repeating at this depth
160+
variable `{$ident}` is still repeating at this depth
161161
162162
expand_wrong_fragment_kind =
163163
non-{$kind} macro in {$kind} position: {$name}

‎compiler/rustc_lint/messages.ftl

+7-5
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,8 @@ lint_macro_is_private = macro `{$ident}` is private
445445
lint_macro_rule_never_used = rule #{$n} of macro `{$name}` is never used
446446
447447
lint_macro_use_deprecated =
448-
deprecated `#[macro_use]` attribute used to import macros should be replaced at use sites with a `use` item to import the macro instead
448+
applying the `#[macro_use]` attribute to an `extern crate` item is deprecated
449+
.help = remove it and import macros at use sites with a `use` item instead
449450
450451
lint_malformed_attribute = malformed lint attribute input
451452
@@ -456,7 +457,7 @@ lint_map_unit_fn = `Iterator::map` call that discard the iterator's values
456457
.map_label = after this call to map, the resulting iterator is `impl Iterator<Item = ()>`, which means the only information carried by the iterator is the number of items
457458
.suggestion = you might have meant to use `Iterator::for_each`
458459
459-
lint_metavariable_still_repeating = variable '{$name}' is still repeating at this depth
460+
lint_metavariable_still_repeating = variable `{$name}` is still repeating at this depth
460461
461462
lint_metavariable_wrong_operator = meta-variable repeats with different Kleene operator
462463
@@ -635,8 +636,8 @@ lint_pattern_in_bodiless = patterns aren't allowed in functions without bodies
635636
lint_pattern_in_foreign = patterns aren't allowed in foreign function declarations
636637
.label = pattern not allowed in foreign function
637638
638-
lint_private_extern_crate_reexport =
639-
extern crate `{$ident}` is private, and cannot be re-exported, consider declaring with `pub`
639+
lint_private_extern_crate_reexport = extern crate `{$ident}` is private and cannot be re-exported
640+
.suggestion = consider making the `extern crate` item publicly accessible
640641
641642
lint_proc_macro_derive_resolution_fallback = cannot find {$ns} `{$ident}` in this scope
642643
.label = names from parent modules are not accessible without an explicit import
@@ -847,7 +848,8 @@ lint_unused_coroutine =
847848
}{$post} that must be used
848849
.note = coroutines are lazy and do nothing unless resumed
849850
850-
lint_unused_crate_dependency = external crate `{$extern_crate}` unused in `{$local_crate}`: remove the dependency or add `use {$extern_crate} as _;`
851+
lint_unused_crate_dependency = extern crate `{$extern_crate}` is unused in crate `{$local_crate}`
852+
.help = remove the dependency or add `use {$extern_crate} as _;` to the crate root
851853
852854
lint_unused_def = unused {$pre}`{$def}`{$post} that must be used
853855
.suggestion = use `let _ = ...` to ignore the resulting value

0 commit comments

Comments
 (0)