Skip to content

Conversation

nnethercote
Copy link
Contributor

A follow-up to #132346.

r? @davidtwco

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.
Currently the graphviz code does a `results.visit_with` call while also
holding a `ResultsCursor` on the `results`. That is both kinds of
results traversals at the same time, which is awkward. This commit moves
the `results.visit_with` part earlier so the two results traversals
don't overlap.
@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 Apr 22, 2025
@rustbot
Copy link
Collaborator

rustbot commented Apr 22, 2025

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

@compiler-errors
Copy link
Member

r? compiler-errors @bors r+ rollup

@bors
Copy link
Collaborator

bors commented Apr 22, 2025

📌 Commit 521b379 has been approved by compiler-errors

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 22, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 23, 2025
…enton

Rollup of 7 pull requests

Successful merges:

 - rust-lang#140142 (Some more graphviz tweaks)
 - rust-lang#140146 (Update `compiler_builtins` to 0.1.156)
 - rust-lang#140147 (Clean: rename `open_braces` to `open_delimiters` in lexer and move `make_unclosed_delims_error` into `diagnostics.rs`.)
 - rust-lang#140160 (Use `is_lang_item` and `as_lang_item` instead of handrolling their logic)
 - rust-lang#140163 (Validate extension in `PathBuf::add_extension`)
 - rust-lang#140173 (Ping Mara when touching format_args!() internals.)
 - rust-lang#140175 (`rc""` more clear error message)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 23, 2025
…enton

Rollup of 7 pull requests

Successful merges:

 - rust-lang#140142 (Some more graphviz tweaks)
 - rust-lang#140146 (Update `compiler_builtins` to 0.1.156)
 - rust-lang#140147 (Clean: rename `open_braces` to `open_delimiters` in lexer and move `make_unclosed_delims_error` into `diagnostics.rs`.)
 - rust-lang#140160 (Use `is_lang_item` and `as_lang_item` instead of handrolling their logic)
 - rust-lang#140163 (Validate extension in `PathBuf::add_extension`)
 - rust-lang#140173 (Ping Mara when touching format_args!() internals.)
 - rust-lang#140175 (`rc""` more clear error message)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 23, 2025
…enton

Rollup of 7 pull requests

Successful merges:

 - rust-lang#140142 (Some more graphviz tweaks)
 - rust-lang#140146 (Update `compiler_builtins` to 0.1.156)
 - rust-lang#140147 (Clean: rename `open_braces` to `open_delimiters` in lexer and move `make_unclosed_delims_error` into `diagnostics.rs`.)
 - rust-lang#140160 (Use `is_lang_item` and `as_lang_item` instead of handrolling their logic)
 - rust-lang#140163 (Validate extension in `PathBuf::add_extension`)
 - rust-lang#140173 (Ping Mara when touching format_args!() internals.)
 - rust-lang#140175 (`rc""` more clear error message)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 23, 2025
…enton

Rollup of 7 pull requests

Successful merges:

 - rust-lang#140142 (Some more graphviz tweaks)
 - rust-lang#140146 (Update `compiler_builtins` to 0.1.156)
 - rust-lang#140147 (Clean: rename `open_braces` to `open_delimiters` in lexer and move `make_unclosed_delims_error` into `diagnostics.rs`.)
 - rust-lang#140160 (Use `is_lang_item` and `as_lang_item` instead of handrolling their logic)
 - rust-lang#140163 (Validate extension in `PathBuf::add_extension`)
 - rust-lang#140173 (Ping Mara when touching format_args!() internals.)
 - rust-lang#140175 (`rc""` more clear error message)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 1b9e11e into rust-lang:master Apr 23, 2025
6 checks passed
@rustbot rustbot added this to the 1.88.0 milestone Apr 23, 2025
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`
@nnethercote nnethercote deleted the some-graphviz-tweaks-2 branch April 23, 2025 23:28
github-actions bot pushed a commit to model-checking/verify-rust-std that referenced this pull request Apr 24, 2025
…enton

Rollup of 7 pull requests

Successful merges:

 - rust-lang#140142 (Some more graphviz tweaks)
 - rust-lang#140146 (Update `compiler_builtins` to 0.1.156)
 - rust-lang#140147 (Clean: rename `open_braces` to `open_delimiters` in lexer and move `make_unclosed_delims_error` into `diagnostics.rs`.)
 - rust-lang#140160 (Use `is_lang_item` and `as_lang_item` instead of handrolling their logic)
 - rust-lang#140163 (Validate extension in `PathBuf::add_extension`)
 - rust-lang#140173 (Ping Mara when touching format_args!() internals.)
 - rust-lang#140175 (`rc""` more clear error message)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants