Skip to content

Commit de14c03

Browse files
authored
Rollup merge of rust-lang#139886 - nnethercote:graphviz_borrowck, r=compiler-errors
`borrowck_graphviz_*` attribute tweaks A couple of small fixes to out-of-date things. r? `@davidtwco`
2 parents 7dd411a + 62882f3 commit de14c03

File tree

4 files changed

+3
-12
lines changed

4 files changed

+3
-12
lines changed

compiler/rustc_mir_dataflow/src/framework/graphviz.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ impl RustcMirAttrs {
122122
})
123123
} else if attr.has_name(sym::borrowck_graphviz_format) {
124124
Self::set_field(&mut ret.formatter, tcx, &attr, |s| match s {
125-
sym::gen_kill | sym::two_phase => Ok(s),
125+
sym::two_phase => Ok(s),
126126
_ => {
127127
tcx.dcx().emit_err(UnknownFormatter { span: attr.span() });
128128
Err(())

compiler/rustc_span/src/symbol.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1068,7 +1068,6 @@ symbols! {
10681068
ge,
10691069
gen_blocks,
10701070
gen_future,
1071-
gen_kill,
10721071
generator_clone,
10731072
generators,
10741073
generic_arg_infer,

src/doc/rustc-dev-guide/src/compiler-debugging.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,8 @@ Right below you can find elaborate explainers on a selected few.
301301

302302
Some compiler options for debugging specific features yield graphviz graphs -
303303
e.g. the `#[rustc_mir(borrowck_graphviz_postflow="suffix.dot")]` attribute
304-
dumps various borrow-checker dataflow graphs.
304+
on a function dumps various borrow-checker dataflow graphs in conjunction with
305+
`-Zdump-mir-dataflow`.
305306

306307
These all produce `.dot` files. To view these files, install graphviz (e.g.
307308
`apt-get install graphviz`) and then run the following commands:

tests/ui/mir-dataflow/README.md

-9
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,3 @@ each generated output path.
4242
on *entry* to each block, as well as the gen- and kill-sets that
4343
were so-called "transfer functions" summarizing the effect of each
4444
basic block.
45-
46-
* (In addition to the `borrowck_graphviz_postflow` attribute-key
47-
noted above, there is also `borrowck_graphviz_preflow`; it has the
48-
same interface and generates the same set of files, but it renders
49-
the dataflow state after building the gen- and kill-sets but
50-
*before* running the dataflow analysis itself, so each entry-set is
51-
just the initial default state for that dataflow analysis. This is
52-
less useful for understanding the error message output in these
53-
tests.)

0 commit comments

Comments
 (0)