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

Rollup of 4 pull requests #116598

Merged
merged 10 commits into from
Oct 10, 2023
Merged

Rollup of 4 pull requests #116598

merged 10 commits into from
Oct 10, 2023

Commits on Oct 10, 2023

  1. use env variable to control thread ids in rustc_log

    @SparrowLii
    SparrowLii committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    2dcc828 View commit details
    Browse the repository at this point in the history

  2. coverage: Replace ShortCircuitPreorder with a single function 

    Instead of defining a named struct, we can use `std::iter::from_fn` and store
intermediate state in a closure.
    @Zalathar
    Zalathar committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    f214497 View commit details
    Browse the repository at this point in the history

  3. coverage: Unbox and simplify bcb_filtered_successors 

    This function already has access to the MIR body, so instead of taking a
reference to a terminator, it's simpler and easier to pass in a basic block
index.

There is no need to box the returned iterator if we instead add appropriate
lifetime captures, since `short_circuit_preorder` is now generic over the type
of iterator it expects.

We can also greatly simplify the function's implementation by observing that
the only difference between its two cases is whether we take all of a BB's
successors, or just the first one.
    @Zalathar
    Zalathar committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    5d62945 View commit details
    Browse the repository at this point in the history

  4. -Zmir-enable-passes: document that this may enable unsound passes

    @RalfJung
    RalfJung committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    2de4546 View commit details
    Browse the repository at this point in the history

  5. add some comments explaining why MIR opts are marked as unsound

    @RalfJung
    RalfJung committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    d805b26 View commit details
    Browse the repository at this point in the history

  6. reorder files in solve

    @lcnr
    lcnr committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    c70ef36 View commit details
    Browse the repository at this point in the history

  7. Rollup merge of rust-lang#116586 - SparrowLii:parallel_log, r=oli-obk 

    use env variable to control thread ids in rustc_log

Currently, when parallel rustc is enabled, even if the number of threads is 1, the thread ID will be included before all the logs.
E.g.
`WARN rustc_mir_build::thir::pattern::const_to_pat ...`
=>
`2:rustcWARN rustc_mir_build::thir::pattern::const_to_pat ...`
This makes the logs confusing and results in inconsistent UI test results for serial and parallel rustc. Therefore I think we should let users decide whether thread id information is needed through explicit control.
    @matthiaskrgr
    matthiaskrgr authored Oct 10, 2023
    Configuration menu
    Copy the full SHA
    0bc5696 View commit details
    Browse the repository at this point in the history

  8. Rollup merge of rust-lang#116589 - Zalathar:successors, r=oli-obk 

    coverage: Unbox and simplify `bcb_filtered_successors`

This is a small cleanup in the coverage instrumentor's graph-building code.

---
This function already has access to the MIR body, so instead of taking a reference to a terminator, it's simpler and easier to pass in a basic block index.

There is no need to box the returned iterator if we instead add appropriate lifetime captures, and make `short_circuit_preorder` generic over the type of iterator it expects.

We can also greatly simplify the function's implementation by observing that the only difference between its two cases is whether we take all of a BB's successors, or just the first one.

---

`@rustbot` label +A-code-coverage
    @matthiaskrgr
    matthiaskrgr authored Oct 10, 2023
    Configuration menu
    Copy the full SHA
    f4de82c View commit details
    Browse the repository at this point in the history

  9. Rollup merge of rust-lang#116595 - RalfJung:mir-enable-passes, r=oli-obk 

    -Zmir-enable-passes: document that this may enable unsound passes

also add some comments explaining why MIR opts are marked as unsound
    @matthiaskrgr
    matthiaskrgr authored Oct 10, 2023
    Configuration menu
    Copy the full SHA
    de4980c View commit details
    Browse the repository at this point in the history

  10. Rollup merge of rust-lang#116596 - lcnr:normalize-subdir, r=compiler-… 

    …errors

reorder files in solve

r? `@compiler-errors`
    @matthiaskrgr
    matthiaskrgr authored Oct 10, 2023
    Configuration menu
    Copy the full SHA
    da42858 View commit details
    Browse the repository at this point in the history