Skip to content

Commit 90c8a0a

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 18cab7c + fa58d40 commit 90c8a0a

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

src/queries/incremental-compilation-in-detail.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ the `LocalId`s within it are still the same.
264264

265265

266266

267-
### Checking query results for changes: `HashStable` and `Fingerprint`s
267+
### Checking query results for changes: `StableHash` and `Fingerprint`s
268268

269269
In order to do red-green-marking we often need to check if the result of a
270270
query has changed compared to the result it had during the previous compilation session.
@@ -285,7 +285,7 @@ We call this hash value "the `Fingerprint` of the query result".
285285
The hashing is (and has to be) done "in a stable way".
286286
This means that whenever something is hashed that might change in between compilation
287287
sessions (e.g. a `DefId`), we instead hash its stable equivalent
288-
(e.g. the corresponding `DefPath`). That's what the whole `HashStable`
288+
(e.g. the corresponding `DefPath`). That's what the whole `StableHash`
289289
infrastructure is for.
290290
This way `Fingerprint`s computed in two different compilation sessions are still comparable.
291291

0 commit comments

Comments
 (0)