Unnamed repository; edit this file 'description' to name the repository.
Auto merge of #156078 - JonathanBrouwer:rollup-WF8BsN3, r=JonathanBrouwer
Rollup of 9 pull requests
Successful merges:
- rust-lang/rust#156030 (Make stable hashing names consistent (part 1))
- rust-lang/rust#156020 (Improve source code for `librustdoc/visit_ast.rs`)
- rust-lang/rust#156021 (Clean up some traits)
- rust-lang/rust#156028 (Add a `Local::arg(i)` helper constructor)
- rust-lang/rust#156037 (Add AcceptContext::expect_no_args)
- rust-lang/rust#156040 (Add missing alias to mailmap)
- rust-lang/rust#156048 (Make `diverging_type_vars` a vec of `TyVid`)
- rust-lang/rust#156053 (Reuse CTFE MIR for constructors.)
- rust-lang/rust#156059 (compiler: Print valid `-Zmir-enable-passes` names if invalid name is used)
Failed merges:
- rust-lang/rust#155940 (refactor rustc_on_unimplemented's filtering)
- rust-lang/rust#156065 (Remove unused spans from AttributeKind)
| -rw-r--r-- | crates/hir-ty/src/next_solver/interner.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/hir-ty/src/next_solver/interner.rs b/crates/hir-ty/src/next_solver/interner.rs index 4095dbe47d..cfb55e2e00 100644 --- a/crates/hir-ty/src/next_solver/interner.rs +++ b/crates/hir-ty/src/next_solver/interner.rs @@ -454,7 +454,7 @@ impl VariantDef { /* /// Definition of a variant -- a struct's fields or an enum variant. -#[derive(Debug, HashStable, TyEncodable, TyDecodable)] +#[derive(Debug, StableHash, TyEncodable, TyDecodable)] pub struct VariantDef { /// `DefId` that identifies the variant itself. /// If this variant belongs to a struct or union, then this is a copy of its `DefId`. |