diff options
| author | bors <bors@rust-lang.org> | 2025-03-01 11:43:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-03-01 11:43:19 +0000 |
| commit | 8c392966a013fd8a09e6b78b3c8d6e442bc278e1 (patch) | |
| tree | 2739778e1d2a658ac43ab4827ea95193ba3d00d8 /compiler/rustc_resolve/src/errors.rs | |
| parent | 0c72c0d11adeba449886089c6bd5d48363f7a2cd (diff) | |
| parent | c03756a56b2e5a5e327f4e81b37ede0c92e8d305 (diff) | |
| download | rust-8c392966a013fd8a09e6b78b3c8d6e442bc278e1.tar.gz rust-8c392966a013fd8a09e6b78b3c8d6e442bc278e1.zip | |
Auto merge of #137848 - matthiaskrgr:rollup-vxtrkis, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #136503 (Tweak output of const panic diagnostic) - #137390 (tests: fix up new test for nocapture -> capture(none) change) - #137617 (Introduce `feature(generic_const_parameter_types)`) - #137719 (Add missing case explanation for doc inlined re-export of doc hidden item) - #137763 (Use `mk_ty_from_kind` a bit less, clean up lifetime handling in borrowck) - #137769 (Do not yeet `unsafe<>` from type when formatting unsafe binder) - #137776 (Some `rustc_transmute` cleanups) - #137800 (Remove `ParamEnv::without_caller_bounds`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_resolve/src/errors.rs')
| -rw-r--r-- | compiler/rustc_resolve/src/errors.rs | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/compiler/rustc_resolve/src/errors.rs b/compiler/rustc_resolve/src/errors.rs index 7eb795034b0..b5d3e5ea776 100644 --- a/compiler/rustc_resolve/src/errors.rs +++ b/compiler/rustc_resolve/src/errors.rs @@ -347,19 +347,6 @@ pub(crate) struct ParamInTyOfConstParam { #[label] pub(crate) span: Span, pub(crate) name: Symbol, - #[subdiagnostic] - pub(crate) param_kind: Option<ParamKindInTyOfConstParam>, -} - -#[derive(Debug)] -#[derive(Subdiagnostic)] -pub(crate) enum ParamKindInTyOfConstParam { - #[note(resolve_type_param_in_ty_of_const_param)] - Type, - #[note(resolve_const_param_in_ty_of_const_param)] - Const, - #[note(resolve_lifetime_param_in_ty_of_const_param)] - Lifetime, } #[derive(Diagnostic)] |