Skip to content

detect additional uses of opaques after writeback - #140641

Merged
bors merged 2 commits into
rust-lang:masterfrom
lcnr:opaque-type-storage-entries
May 8, 2025
Merged

detect additional uses of opaques after writeback#140641
bors merged 2 commits into
rust-lang:masterfrom
lcnr:opaque-type-storage-entries

Conversation

@lcnr

@lcnrlcnr commented May 4, 2025•
edited
Loading

Copy link
Copy Markdown
Contributor

Based on #140607. It's a lot harder to encounter in practice than I though 😅 😁 I've still added it with the expectation that somebody will encounter it at some point.

Also modifies the EvalCtxt to use the same impl to detect newly added opaque types.

r? @compiler-errors

@rustbotrustbot 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels May 4, 2025
@rustbot

rustbot commented May 4, 2025

Copy link
Copy Markdown
Collaborator

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

matthiaskrgr
matthiaskrgr reviewed May 4, 2025
View reviewed changes
Comment threadcompiler/rustc_hir_typeck/src/opaque_types.rs Outdated
@rust-cloud-vms
rust-cloud-vmsBotforce-pushed the opaque-type-storage-entries branch 3 times, most recently from f270507 to 8fe59d0CompareMay 4, 2025 18:01
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-cloud-vms
rust-cloud-vmsBotforce-pushed the opaque-type-storage-entries branch from 8fe59d0 to 4b89483CompareMay 4, 2025 18:36
@lcnrlcnr mentioned this pull request May 5, 2025
Closed
@bors

bors commented May 6, 2025

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #140682) made this pull request unmergeable. Please resolve the merge conflicts.

@rust-cloud-vms
rust-cloud-vmsBotforce-pushed the opaque-type-storage-entries branch from 4b89483 to 99cf4e8CompareMay 6, 2025 15:03
@rustbot

rustbot commented May 6, 2025

Copy link
Copy Markdown
Collaborator

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@compiler-errors

compiler-errors commented May 6, 2025

Copy link
Copy Markdown
Contributor

r=me after base pr lands

@compiler-errors

compiler-errors commented May 6, 2025

Copy link
Copy Markdown
Contributor

@rustbot blocked

@rustbotrustbot added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 6, 2025
@rust-cloud-vms
rust-cloud-vmsBotforce-pushed the opaque-type-storage-entries branch from 99cf4e8 to e7979eaCompareMay 7, 2025 17:59
@lcnr

lcnr commented May 7, 2025

Copy link
Copy Markdown
ContributorAuthor

@rustbot author

@rustbotrustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels May 7, 2025
@rustbot

rustbot commented May 7, 2025

Copy link
Copy Markdown
Collaborator

Reminder, once the PR becomes ready for a review, use @rustbot ready.

@lcnr

lcnr commented May 7, 2025

Copy link
Copy Markdown
ContributorAuthor

@rustbot ready

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 7, 2025
@compiler-errors

compiler-errors commented May 7, 2025

Copy link
Copy Markdown
Contributor

@bors r+ rollup=never

@bors

bors commented May 7, 2025

Copy link
Copy Markdown
Collaborator

📌 Commit e7979ea has been approved by compiler-errors

It is now in the queue for this repository.

@borsbors 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 May 7, 2025
@compiler-errors

compiler-errors commented May 7, 2025

Copy link
Copy Markdown
Contributor

@bors rollup=maybe

Zalathar added a commit to Zalathar/rust that referenced this pull request May 8, 2025
@Zalathar
Rollup merge ofrust-lang#140641- lcnr:opaque-type-storage-entries, …
69fabc3
…r=compiler-errors
detect additional uses of opaques after writeback
Based on rust-lang#140607. It's a lot harder to encounter in practice than I though 😅 😁 I've still added it with the expectation that somebody will encounter it at some point.
Also modifies the `EvalCtxt` to use the same impl to detect newly added opaque types.
r? `@compiler-errors`
@ZalatharZalathar mentioned this pull request May 8, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request May 8, 2025
@bors
Auto merge ofrust-lang#140777- Zalathar:rollup-hdzhmqw, r=Zalathar
b1bc0b2
Rollup of 15 pull requests
Successful merges:
- rust-lang#138736 (Sanitizers target modificators)
- rust-lang#140260 (Only prefer param-env candidates if they remain non-global after norm)
- rust-lang#140523 (Better error message for late/early lifetime param mismatch)
- rust-lang#140579 (Remove estebank from automated review assignment)
- rust-lang#140641 (detect additional uses of opaques after writeback)
- rust-lang#140711 (Do not discard constraints on overflow if there was candidate ambiguity)
- rust-lang#140716 (Improve `-Zremap-path-scope` tests with dependency)
- rust-lang#140755 ([win][arm64] Disable various DebugInfo tests that don't work on Arm64 Windows)
- rust-lang#140756 ([arm64] Pointer auth test should link with C static library statically)
- rust-lang#140758 ([win][arm64] Disable MSVC Linker 'Arm Hazard' warning)
- rust-lang#140759 ([win][arm64] Disable std::fs tests that require symlinks)
- rust-lang#140762 (rustdoc-json: Remove newlines from attributes)
- rust-lang#140764 (style: Never break within a nullary function call `func()` or a unit literal `()`)
- rust-lang#140769 (Add `DefPathData::OpaqueLifetime` to avoid conflicts for remapped opaque lifetimes)
- rust-lang#140773 (triagebot: Better message for changes to `tests/rustdoc-json`)
r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgrmatthiaskrgr mentioned this pull request May 8, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 8, 2025
@bors
Auto merge ofrust-lang#140781- matthiaskrgr:rollup-90sig9g, r=matth…
1973872
…iaskrgr
Rollup of 9 pull requests
Successful merges:
- rust-lang#140260 (Only prefer param-env candidates if they remain non-global after norm)
- rust-lang#140523 (Better error message for late/early lifetime param mismatch)
- rust-lang#140579 (Remove estebank from automated review assignment)
- rust-lang#140641 (detect additional uses of opaques after writeback)
- rust-lang#140711 (Do not discard constraints on overflow if there was candidate ambiguity)
- rust-lang#140762 (rustdoc-json: Remove newlines from attributes)
- rust-lang#140764 (style: Never break within a nullary function call `func()` or a unit literal `()`)
- rust-lang#140769 (Add `DefPathData::OpaqueLifetime` to avoid conflicts for remapped opaque lifetimes)
- rust-lang#140773 (triagebot: Better message for changes to `tests/rustdoc-json`)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit aace488 into rust-lang:masterMay 8, 2025
@rustbotrustbot added this to the 1.88.0 milestone May 8, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request May 8, 2025
@rust-timer
Unrolled build forrust-lang#140641
fa2fbd5
Rollup merge of rust-lang#140641 - lcnr:opaque-type-storage-entries, r=compiler-errors
detect additional uses of opaques after writeback
Based on rust-lang#140607. It's a lot harder to encounter in practice than I though 😅 😁 I've still added it with the expectation that somebody will encounter it at some point.
Also modifies the `EvalCtxt` to use the same impl to detect newly added opaque types.
r? ``@compiler-errors``
@lcnr
lcnr deleted the opaque-type-storage-entries branch May 8, 2025 14:13
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@matthiaskrgrmatthiaskrgrmatthiaskrgr left review comments
+1 more reviewer
@compiler-errorscompiler-errorscompiler-errors approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@compiler-errorscompiler-errors

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.WG-trait-system-refactorThe Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Milestone

1.88.0

Development

Successfully merging this pull request may close these issues.

6 participants

@lcnr@rustbot@rust-log-analyzer@bors@compiler-errors@matthiaskrgr