Make stable hashing names consistent (part 1)#156030
Make stable hashing names consistent (part 1)#156030rust-bors[bot] merged 4 commits intorust-lang:mainfrom
Conversation
|
Some changes occurred in compiler/rustc_ast/src/expand/autodiff_attrs.rs cc @ZuseZ4 Some changes occurred to diagnostic attributes. cc @mejrs Some changes occurred in compiler/rustc_hir/src/attrs cc @jdonszelmann, @JonathanBrouwer Some changes occurred in cc @BoxyUwU The Cranelift subtree was changed cc @bjorn3 rust-analyzer is developed in its own repository. If possible, consider making this change to rust-lang/rust-analyzer instead. cc @rust-lang/rust-analyzer Some changes occurred in coverage instrumentation. cc @Zalathar
cc @TaKO8Ki The rustc-dev-guide subtree was changed. If this PR only touches the dev guide consider submitting a PR directly to rust-lang/rustc-dev-guide otherwise thank you for updating the dev guide with your changes. Some changes occurred to the CTFE / Miri interpreter cc @rust-lang/miri, @RalfJung, @oli-obk, @lcnr These commits modify compiler targets. This PR changes MIR cc @oli-obk, @RalfJung, @JakobDegen, @vakaras Some changes occurred in compiler/rustc_ast/src/expand/typetree.rs cc @ZuseZ4 |
There was a problem hiding this comment.
r=me after rust-lang/compiler-team#983 is accepted
This comment has been minimized.
This comment has been minimized.
3e181f9 to
36b9dd7
Compare
This comment has been minimized.
This comment has been minimized.
|
^ Solved conflicts |
…r=JonathanBrouwer
Make stable hashing names consistent (part 1)
This PR starts the implementation of MCP 893. It renames the things that appear in the `HashStable` trait, changing this:
```
pub trait HashStable {
fn hash_stable<Hcx: HashStableContext>(&self, hcx: &mut Hcx, hasher: &mut StableHasher);
}
```
to this:
```
pub trait StableHash {
fn stable_hash<Hcx: StableHashCtxt>(&self, hcx: &mut Hcx, hasher: &mut StableHasher);
}
```
Details in individual commits.
This is the biggest part of the renaming. A follow-up PR will rename the remaining things.
r? @jieyouxu
Part of MCP 983.
Part of MCP 983.
Specifically: - `HashStable` -> `StableHash` (trait) - `HashStable` -> `StableHash` (derive) - `HashStable_NoContext` -> `StableHash_NoContext` (derive) Note: there are some names in `compiler/rustc_macros/src/hash_stable.rs` that are still to be renamed, e.g. `HashStableMode`. Part of MCP 983.
36b9dd7 to
e7d28d3
Compare
|
This pull request was unapproved. |
|
^ Rebased to solve a soft conflict |
|
This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed. Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers. |
…uwer Rollup of 9 pull requests Successful merges: - #156030 (Make stable hashing names consistent (part 1)) - #156020 (Improve source code for `librustdoc/visit_ast.rs`) - #156021 (Clean up some traits) - #156028 (Add a `Local::arg(i)` helper constructor) - #156037 (Add AcceptContext::expect_no_args) - #156040 (Add missing alias to mailmap) - #156048 (Make `diverging_type_vars` a vec of `TyVid`) - #156053 (Reuse CTFE MIR for constructors.) - #156059 (compiler: Print valid `-Zmir-enable-passes` names if invalid name is used) Failed merges: - #155940 (refactor rustc_on_unimplemented's filtering) - #156065 (Remove unused spans from AttributeKind)
Rollup merge of #156030 - nnethercote:StableHash-renamings, r=JonathanBrouwer Make stable hashing names consistent (part 1) This PR starts the implementation of MCP 893. It renames the things that appear in the `HashStable` trait, changing this: ``` pub trait HashStable { fn hash_stable<Hcx: HashStableContext>(&self, hcx: &mut Hcx, hasher: &mut StableHasher); } ``` to this: ``` pub trait StableHash { fn stable_hash<Hcx: StableHashCtxt>(&self, hcx: &mut Hcx, hasher: &mut StableHasher); } ``` Details in individual commits. This is the biggest part of the renaming. A follow-up PR will rename the remaining things. r? @jieyouxu
…uwer 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)
…uwer 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)
1. The `HashStable` trait was renamed to `StableHash`, and its method was also renamed to match.
rust-lang/rust#156030
2. `rustc_hir::attrs::AttributeKind::NoStd` is now fieldless.
rust-lang/rust#156065
PiperOrigin-RevId: 910142545
1. The `HashStable` trait was renamed to `StableHash`, and its method was also renamed to match.
rust-lang/rust#156030
2. `rustc_hir::attrs::AttributeKind::NoStd` is now fieldless.
rust-lang/rust#156065
PiperOrigin-RevId: 910142545
1. The `HashStable` trait was renamed to `StableHash`, and its method was also renamed to match.
rust-lang/rust#156030
2. `rustc_hir::attrs::AttributeKind::NoStd` is now fieldless.
rust-lang/rust#156065
PiperOrigin-RevId: 910142545
1. The `HashStable` trait was renamed to `StableHash`, and its method was also renamed to match.
rust-lang/rust#156030
2. `rustc_hir::attrs::AttributeKind::{NoStd, NoCore}` are now fieldless.
rust-lang/rust#156065
PiperOrigin-RevId: 910142545
1. The `HashStable` trait was renamed to `StableHash`, and its method was also renamed to match.
rust-lang/rust#156030
2. `rustc_hir::attrs::AttributeKind::{NoStd, NoCore}` are now fieldless.
rust-lang/rust#156065
PiperOrigin-RevId: 910142545
1. The `HashStable` trait was renamed to `StableHash`, and its method was also renamed to match.
rust-lang/rust#156030
2. `rustc_hir::attrs::AttributeKind::{NoStd, NoCore}` are now fieldless.
rust-lang/rust#156065
PiperOrigin-RevId: 910219736
This PR starts the implementation of MCP 893. It renames the things that appear in the
HashStabletrait, changing this:to this:
Details in individual commits.
This is the biggest part of the renaming. A follow-up PR will rename the remaining things.
r? @jieyouxu