Unnamed repository; edit this file 'description' to name the repository.
Merge ref '44860d3e9ef7' from rust-lang/rust
Pull recent changes from https://github.com/rust-lang/rust via Josh.
Upstream ref: rust-lang/rust@44860d3e9ef700cac0b4a61d924f41f46bf1b447
Filtered ref: rust-lang/miri@e4425fbb4f53d1911d3fc1203b76c7905b8a5957
Upstream diff: https://github.com/rust-lang/rust/compare/a021a7796f66600f46013d6c8d1dfc9e8d7f4a92...44860d3e9ef700cac0b4a61d924f41f46bf1b447
This merge was created using https://github.com/rust-lang/josh-sync.
| -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`. |