Remove some unnecessary erases #141051
Merged
Remove some unnecessary erases #141051
Conversation
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
|
r? oli-obk |
|
r? @nnethercote rustbot has assigned @nnethercote. Use |
rustbot
added
S-waiting-on-review
|
Some changes occurred to MIR optimizations cc @rust-lang/wg-mir-opt |
|
(or anyone can review it, not just oli) |
compiler-errors
commented
May 15, 2025
| @@ -490,11 +490,7 @@ impl<'a, 'tcx> CastCheck<'tcx> { | |||
| && let Some(from_trait) = fcx.tcx.get_diagnostic_item(sym::From) | |||
| { | |||
| let ty = fcx.resolve_vars_if_possible(self.cast_ty); | |||
| // Erase regions to avoid panic in `prove_value` when calling | |||
There was a problem hiding this comment.
Comment no longer applies.
| @@ -1453,9 +1453,7 @@ pub trait PrettyPrinter<'tcx>: Printer<'tcx> + fmt::Write { | |||
| // contain named regions. So we erase and anonymize everything | |||
| // here to compare the types modulo regions below. | |||
| let proj = cx.tcx().erase_regions(proj); | |||
| let proj = cx.tcx().anonymize_bound_vars(proj); | |||
There was a problem hiding this comment.
erase_regions already anonymizes binders
| @@ -32,7 +32,7 @@ impl<'a, 'tcx> MutVisitor<'tcx> for SubTypeChecker<'a, 'tcx> { | |||
| let mut rval_ty = rvalue.ty(self.local_decls, self.tcx); | |||
| // Not erasing this causes `Free Regions` errors in validator, | |||
| // when rval is `ReStatic`. | |||
| rval_ty = self.tcx.erase_regions_ty(rval_ty); | |||
There was a problem hiding this comment.
this was directly calling the query for some reason, rather than going throuh erase_regions
|
@bors r+ |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 17, 2025
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#140208 (Make well-formedness predicates no longer coinductive) - rust-lang#140957 (Add `#[must_use]` to Array::map) - rust-lang#141031 (Async drop fix for dropee from another crate (rust-lang#140858)) - rust-lang#141036 (ci: split the dist-ohos job) - rust-lang#141051 (Remove some unnecessary erases) - rust-lang#141056 (Lowercase git url for rust-lang/enzyme.git) - rust-lang#141059 (HIR: explain in comment why `ExprKind::If` "then" is an `Expr`) - rust-lang#141070 (Do not emit help when shorthand from macro when suggest `?` or `expect`) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 17, 2025
Rollup merge of rust-lang#141051 - compiler-errors:less-erase, r=nnethercote Remove some unnecessary erases Some nits I pulled out of rust-lang#140814.
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.
Some nits I pulled out of #140814.