Make lifting infallible#155987
Open
nnethercote wants to merge 2 commits intorust-lang:mainfrom
Open
Conversation
rustbot
added
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
Various places where `lift` just isn't necessary. Either because we're not within a closure passed to `tls::with`, or because the type being lifted doesn't have a `'tcx` lifetime.
Every lifting root calls `unwrap`/`expect` on the result, except for `ImmTy::fmt` but there's no good reason for that exception. Making lifting infallible is sensible because it should only fail if the wrong interner is somehow used, which indicates a major bug in rustc rather than an error condition.
nnethercote
force-pushed
the
infallible-Lifting
branch
from
b2e49ff to
a762dbf
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. |
oli-obk
approved these changes
Apr 30, 2026
Contributor
rust-bors
Bot
added
S-waiting-on-bors
jhpratt
added a commit
to jhpratt/rust
that referenced
this pull request
Apr 30, 2026
…oli-obk Make lifting infallible Details in individual commits. r? @oli-obk
rust-bors Bot
pushed a commit
that referenced
this pull request
Apr 30, 2026
Rollup of 6 pull requests Successful merges: - #155853 (Use `_mcount` as the mcount symbol name on RISC-V Linux GNU targets) - #155939 (Add feature gate for view_types experiment) - #155974 (add `c_variadic_experimental_arch` feature) - #155523 (Reorganize `tests/ui/issues/` - 02) - #155980 (Move `feature*` methods from `parse` mod to `errors` mod.) - #155987 (Make lifting infallible) Failed merges: - #155237 (Disentangle AST crates and error crates)
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
4 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.
Details in individual commits.
r? @oli-obk