Skip to content

Commit b73031d

Browse files
committed
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)
2 parents 532482c + 865933a commit b73031d

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

crates/hir-ty/src/next_solver/interner.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ impl VariantDef {
454454

455455
/*
456456
/// Definition of a variant -- a struct's fields or an enum variant.
457-
#[derive(Debug, HashStable, TyEncodable, TyDecodable)]
457+
#[derive(Debug, StableHash, TyEncodable, TyDecodable)]
458458
pub struct VariantDef {
459459
/// `DefId` that identifies the variant itself.
460460
/// If this variant belongs to a struct or union, then this is a copy of its `DefId`.

0 commit comments

Comments
 (0)