Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Some graphviz tweaks #132346

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Some graphviz tweaks #132346

wants to merge 3 commits into from
+58 −53

Conversation

nnethercote
Copy link
Contributor

@nnethercote nnethercote commented Oct 30, 2024 •
edited
Loading

@nnethercote
Rename BlockFormatter::results as BlockFormatter::cursor.
744eb2f 
Because it's a `ResultsCursor`, not a `Results`. I find this easier to
read and understand.
@nnethercote
Simplify graphviz::Formatter.
a8ce44f 
`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.
@nnethercote
Return label from write_node_label.
d921be9 
Instead of appending an empty label. Because it's conceptually simpler.
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Oct 30, 2024
@rustbot rustbot assigned cjgillot and unassigned lcnr Oct 30, 2024
@rust-lang rust-lang deleted a comment from rustbot Oct 30, 2024
@rust-lang rust-lang deleted a comment from rustbot Oct 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@cjgillot cjgillot

Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@nnethercote @cjgillot @lcnr @rustbot