Skip to content

Commit 522666b

Browse files
committed
Auto merge of #150843 - fmease:dyn-ace, r=BoxyUwU
mGCA: Make trait object types with type-level associated consts dyn compatible Under feature `min_generic_const_args` (mGCA) (rust-lang/rust#132980), render traits with non-parametrized type-level associated constants (i.e., `#[type_const]` ones) dyn compatible but force the user to specify all type-level associated consts in the trait object type via bindings (either directly, via supertrait bounds and/or behind trait aliases) just like associated types, their sibling. Fixes rust-lang/rust#130300 (feature request). Fixes rust-lang/rust#136063 (bug). Fixes rust-lang/rust#137260 (bug). Fixes rust-lang/rust#137514 (bug). While I'm accounting for most illegal `Self` references via const projections & params, I'm intentionally ignoring RUST-123140 (and duplicates) in this PR which is to be tackled some other time. Additional context: Crate `rustc-demangle` had to be updated to fix v0 demangling. I've patched it in PR rust-lang/rustc-demangle#87 which was was released in version 0.1.27 via PR rust-lang/rustc-demangle#88.
2 parents 51f061e + 3f4b449 commit 522666b

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

src/debuginfo/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ impl DebugContext {
242242
let generics = tcx.generics_of(enclosing_fn_def_id);
243243
let args = instance.args.truncate_to(tcx, generics);
244244

245-
type_names::push_generic_params(
245+
type_names::push_generic_args(
246246
tcx,
247247
tcx.normalize_erasing_regions(ty::TypingEnv::fully_monomorphized(), args),
248248
&mut name,

0 commit comments

Comments
 (0)