Some graphviz tweaks #132346
Merged
Some graphviz tweaks #132346
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Because it's a `ResultsCursor`, not a `Results`. I find this easier to read and understand.
`Formatter` currently has a `RefCell<Option<Results>>` field. This is so the `Results` can be temporarily taken and put into a `ResultsCursor` that is used by `BlockFormatter`, and then put back, which is messy. This commit changes `Formatter` to have a `RefCell<ResultsCursor>` and `BlockFormatter` to have a `&mut ResultsCursor`, which greatly simplifies the code at the `Formatter`/`BlockFormatter` interaction point in `Formatter::node_label`. It also means we construct a `ResultsCursor` once per `Formatter`, instead of once per `node_label` call. The commit also: - documents the reason for the `RefCell`; - adds a `Formatter::body` method, replacing the `Formatter::body` field.
Instead of appending an empty label. Because it's conceptually simpler.
rustbot
added
S-waiting-on-review
|
One r+ is enough, thanks! @bors r=lcnr rollup |
bors
added
S-waiting-on-bors
|
@bors r+ rollup |
|
💡 This pull request was already approved, no need to approve it again.
|
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 30, 2024
Rollup of 6 pull requests Successful merges: - rust-lang#130098 (Reject generic self types.) - rust-lang#131096 (rustdoc: Remove usage of `allow(unused)` attribute on `no_run` merged doctests) - rust-lang#132315 (compiletest: improve robustness of LLVM version handling) - rust-lang#132346 (Some graphviz tweaks) - rust-lang#132359 (Fix AIX libc call char type from i8 to u8) - rust-lang#132360 (Un-vacation myself) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 30, 2024
Rollup merge of rust-lang#132346 - nnethercote:some-graphviz-tweaks, r=cjgillot Some graphviz tweaks r? `@cjgillot`
nnethercote
added a commit
to nnethercote/rust
that referenced
this pull request
Apr 22, 2025
Instead of `ResultsCursor`. This partly undoes the second commit from rust-lang#132346; possible because `Results::as_result_cursor` (which doesn't consume the `Results`) is now available. Delaying the `ResultsCursor` construction will facilitate the next couple of commits.
ChrisDenton
added a commit
to ChrisDenton/rust
that referenced
this pull request
Apr 23, 2025
…, r=compiler-errors Some more graphviz tweaks A follow-up to rust-lang#132346. r? `@davidtwco`
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 23, 2025
Rollup merge of rust-lang#140142 - nnethercote:some-graphviz-tweaks-2, r=compiler-errors Some more graphviz tweaks A follow-up to rust-lang#132346. r? `@davidtwco`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
r? @cjgillot