Repository navigation
Migrate basic block ctors to require Terminator where possible - #165517
Merged
Merged
Conversation
Collaborator
|
Some changes occurred in coverage instrumentation. cc @Zalathar Some changes occurred to MIR optimizations cc @rust-lang/wg-mir-opt |
Collaborator
|
r? @folkertdev rustbot has assigned @folkertdev. Use Why was this reviewer chosen?The reviewer was selected based on:
|
This comment has been minimized.
This comment has been minimized.
This comment was marked as outdated.
This comment was marked as outdated.
panstromek
force-pushed
the
no-terminator-option-2
branch
from
November 5, 2026 19:11
d748673 to
5cc2524
Compare
Collaborator
|
This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed. Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers. |
This comment was marked as outdated.
This comment was marked as outdated.
Contributor
|
@bors r+ rollup |
Contributor
Zalathar
added a commit
to Zalathar/rust
that referenced
this pull request
Nov 7, 2026
… r=folkertdev Migrate basic block ctors to require Terminator where possible This is a step towards replacing `Option<Terminator>` with `Terminator` in `BasicBlockData`. See [this thread](https://rust-lang.zulipchat.com/#narrow/channel/131828-t-compiler/topic/vibe.20check.20-.20removing.20Option.20from.20Terminator/with/637588808) for more info. This commit changes `BasicBlockData` constructors to require `Terminator`. For callsites where this is not yet possible, it keeps existing constructors with `Option` under different names. These are intentionally more verbose to point people towards the new ones. There should be no behaviour change.
rust-bors Bot
pushed a commit
that referenced
this pull request
Nov 7, 2026
…uwer Rollup of 8 pull requests Successful merges: - #164784 (Introduce OptimizationObjective and fix the entry shim's size attributes) - #165469 (Make notable trait `i` badges `<span>` instead of `<a>`) - #165576 (compiletest: Reject whitespace between `//` & `@` and reject leading revision conditions like (e.g., `//[rev]@ dir`)) - #147696 (Implement `bit` and `set_bit` for integral types.) - #163202 (nuttx: use updated pollfd definition) - #165482 (apply `-Zcrate-attr` attributes before the crate attributes) - #165517 (Migrate basic block ctors to require Terminator where possible) - #165552 (use lang item instead of name when assembling builtin `Clone::clone` instances)
rust-bors Bot
pushed a commit
that referenced
this pull request
Nov 7, 2026
…uwer Rollup of 8 pull requests Successful merges: - #164784 (Introduce OptimizationObjective and fix the entry shim's size attributes) - #165469 (Make notable trait `i` badges `<span>` instead of `<a>`) - #165576 (compiletest: Reject whitespace between `//` & `@` and reject leading revision conditions like (e.g., `//[rev]@ dir`)) - #147696 (Implement `bit` and `set_bit` for integral types.) - #163202 (nuttx: use updated pollfd definition) - #165482 (apply `-Zcrate-attr` attributes before the crate attributes) - #165517 (Migrate basic block ctors to require Terminator where possible) - #165552 (use lang item instead of name when assembling builtin `Clone::clone` instances)
rust-bors Bot
pushed a commit
that referenced
this pull request
Nov 7, 2026
Rollup merge of #165517 - panstromek:no-terminator-option-2, r=folkertdev Migrate basic block ctors to require Terminator where possible This is a step towards replacing `Option<Terminator>` with `Terminator` in `BasicBlockData`. See [this thread](https://rust-lang.zulipchat.com/#narrow/channel/131828-t-compiler/topic/vibe.20check.20-.20removing.20Option.20from.20Terminator/with/637588808) for more info. This commit changes `BasicBlockData` constructors to require `Terminator`. For callsites where this is not yet possible, it keeps existing constructors with `Option` under different names. These are intentionally more verbose to point people towards the new ones. There should be no behaviour change.
RalfJung
pushed a commit
to JoJoDeveloping/miri
that referenced
this pull request
Nov 8, 2026
…uwer Rollup of 8 pull requests Successful merges: - rust-lang/rust#164784 (Introduce OptimizationObjective and fix the entry shim's size attributes) - rust-lang/rust#165469 (Make notable trait `i` badges `<span>` instead of `<a>`) - rust-lang/rust#165576 (compiletest: Reject whitespace between `//` & `@` and reject leading revision conditions like (e.g., `//[rev]@ dir`)) - rust-lang/rust#147696 (Implement `bit` and `set_bit` for integral types.) - rust-lang/rust#163202 (nuttx: use updated pollfd definition) - rust-lang/rust#165482 (apply `-Zcrate-attr` attributes before the crate attributes) - rust-lang/rust#165517 (Migrate basic block ctors to require Terminator where possible) - rust-lang/rust#165552 (use lang item instead of name when assembling builtin `Clone::clone` instances)
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is a step towards replacing
Option<Terminator>withTerminatorinBasicBlockData. See this thread for more info.This commit changes
BasicBlockDataconstructors to requireTerminator. For callsites where this is not yet possible, it keeps existing constructors withOptionunder different names. These are intentionally more verbose to point people towards the new ones.There should be no behaviour change.