Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 1a77c99

Browse files
committedJul 19, 2024
Auto merge of rust-lang#127936 - matthiaskrgr:rollup-ci0eg7k, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - rust-lang#127418 (Wrap too long type name) - rust-lang#127594 (Fuchsia status code match arm) - rust-lang#127835 (Fix ICE in suggestion caused by `⩵` being recovered as `==`) - rust-lang#127858 (match lowering: Rename `MatchPair` to `MatchPairTree`) - rust-lang#127871 (Mention that type parameters are used recursively on bivariance error) - rust-lang#127913 (remove `debug-logging` default from tools profile) - rust-lang#127925 (Remove tag field from `Relation`s) - rust-lang#127929 (Use more accurate span for `addr_of!` suggestion) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 5affbb1 + d1250bc commit 1a77c99

File tree

63 files changed

+447
-247
lines changed

Some content is hidden

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

63 files changed

+447
-247
lines changed
 

‎compiler/rustc_borrowck/src/type_check/relate_tys.rs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -313,10 +313,6 @@ impl<'bccx, 'tcx> TypeRelation<TyCtxt<'tcx>> for NllTypeRelating<'_, 'bccx, 'tcx
313313
self.type_checker.infcx.tcx
314314
}
315315

316-
fn tag(&self) -> &'static str {
317-
"nll::subtype"
318-
}
319-
320316
#[instrument(skip(self, info), level = "trace", ret)]
321317
fn relate_with_variance<T: Relate<TyCtxt<'tcx>>>(
322318
&mut self,

‎compiler/rustc_hir_analysis/messages.ftl‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,10 @@ hir_analysis_placeholder_not_allowed_item_signatures = the placeholder `_` is no
382382
hir_analysis_precise_capture_self_alias = `Self` can't be captured in `use<...>` precise captures list, since it is an alias
383383
.label = `Self` is not a generic argument, but an alias to the type of the {$what}
384384
385+
hir_analysis_recursive_generic_parameter = {$param_def_kind} `{$param_name}` is only used recursively
386+
.label = {$param_def_kind} must be used non-recursively in the definition
387+
.note = all type parameters must be used in a non-recursive way in order to constrain their variance
388+
385389
hir_analysis_redundant_lifetime_args = unnecessary lifetime parameter `{$victim}`
386390
.note = you can use the `{$candidate}` lifetime directly, in place of `{$victim}`
387391
@@ -549,6 +553,8 @@ hir_analysis_unused_generic_parameter =
549553
{$param_def_kind} `{$param_name}` is never used
550554
.label = unused {$param_def_kind}
551555
.const_param_help = if you intended `{$param_name}` to be a const parameter, use `const {$param_name}: /* Type */` instead
556+
.usage_spans = `{$param_name}` is named here, but is likely unused in the containing type
557+
552558
hir_analysis_unused_generic_parameter_adt_help =
553559
consider removing `{$param_name}`, referring to it in a field, or using a marker such as `{$phantom_data}`
554560
hir_analysis_unused_generic_parameter_adt_no_phantom_data_help =

0 commit comments

Comments
 (0)
This repository has been archived.