Skip to content

Commit 553bb9b

Browse files
committed
Auto merge of #152739 - Zalathar:rollup-8qaJ8F2, r=Zalathar
Rollup of 11 pull requests Successful merges: - rust-lang/rust#152700 (miri subtree update) - rust-lang/rust#152715 (`rust-analyzer` subtree update) - rust-lang/rust#151783 (Implement RFC 3678: Final trait methods) - rust-lang/rust#152512 (core: Implement feature `float_exact_integer_constants`) - rust-lang/rust#152661 (Avoid ICE in From/TryFrom diagnostic under -Znext-solver) - rust-lang/rust#152703 (Remove `rustc_query_system`) - rust-lang/rust#152206 (misc doc improvements) - rust-lang/rust#152664 (Fix mis-constructed `file_span` when generating scraped examples) - rust-lang/rust#152698 (Suppress unstable-trait notes under `-Zforce-unstable-if-unmarked`) - rust-lang/rust#152727 (`probe_op` silence ambiguity errors if tainted) - rust-lang/rust#152728 (Port #![default_lib_allocator] to the new attribute parser)
2 parents 30addec + dec53fb commit 553bb9b

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
@@ -178,7 +178,7 @@ fn try_mark_green(tcx, current_node) -> bool {
178178

179179
> NOTE:
180180
> The actual implementation can be found in
181-
> [`compiler/rustc_query_system/src/dep_graph/graph.rs`][try_mark_green]
181+
> [`compiler/rustc_middle/src/dep_graph/graph.rs`][try_mark_green]
182182
183183
By using red-green marking we can avoid the devastating cumulative effect of
184184
having false positives during change detection. Whenever a query is executed
@@ -534,4 +534,4 @@ information.
534534

535535

536536
[query-model]: ./query-evaluation-model-in-detail.html
537-
[try_mark_green]: https://doc.rust-lang.org/nightly/nightly-rustc/src/rustc_query_system/dep_graph/graph.rs.html
537+
[try_mark_green]: https://doc.rust-lang.org/nightly/nightly-rustc/src/rustc_middle/dep_graph/graph.rs.html

0 commit comments

Comments
 (0)