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.

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

nop_lift macros: ensure that we are using the right interner #115907

Merged
merged 1 commit into from
Sep 18, 2023

Conversation

RalfJung
Copy link
Member

Right now someone could put down the wrong list name when using these macros, and everything would still build. Nothing does a type-check to ensure that the $set contains element of type Self::Lifted. Let's fix that.

For lists this is fairly easy; for the other interners we need to unwrap some newtypes which makes this more complicated.

@rustbot
Copy link
Collaborator

rustbot commented Sep 17, 2023

r? @oli-obk

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot 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. labels Sep 17, 2023
Copy link
Member

@compiler-errors compiler-errors left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me

compiler/rustc_middle/src/ty/context.rs Outdated Show resolved Hide resolved
@RalfJung
Copy link
Member Author

@bors r=compiler-errors

@bors
Copy link
Contributor

bors commented Sep 17, 2023

📌 Commit 3b817b2 has been approved by compiler-errors

It is now in the queue for this repository.

@bors bors 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 Sep 17, 2023
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Sep 18, 2023
…r-errors

nop_lift macros: ensure that we are using the right interner

Right now someone could put down the wrong list name when using these macros, and everything would still build. Nothing does a type-check to ensure that the `$set` contains element of type `Self::Lifted`. Let's fix that.

For lists this is fairly easy; for the other interners we need to unwrap some newtypes which makes this more complicated.
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Sep 18, 2023
…r-errors

nop_lift macros: ensure that we are using the right interner

Right now someone could put down the wrong list name when using these macros, and everything would still build. Nothing does a type-check to ensure that the `$set` contains element of type `Self::Lifted`. Let's fix that.

For lists this is fairly easy; for the other interners we need to unwrap some newtypes which makes this more complicated.
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 18, 2023
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#115558 (issue has since been fixed)
 - rust-lang#115724 (Add myself to the mailmap)
 - rust-lang#115795 (Refactor `opt-dist` to simplify local building)
 - rust-lang#115811 (Make AIX known by bootstrap)
 - rust-lang#115838 (inspect: closer to proof trees for coherence)
 - rust-lang#115902 (Fix up a few CI images)
 - rust-lang#115907 (nop_lift macros: ensure that we are using the right interner)
 - rust-lang#115916 (Add me as on vacation)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 18, 2023
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#115558 (issue has since been fixed)
 - rust-lang#115724 (Add myself to the mailmap)
 - rust-lang#115811 (Make AIX known by bootstrap)
 - rust-lang#115838 (inspect: closer to proof trees for coherence)
 - rust-lang#115902 (Fix up a few CI images)
 - rust-lang#115907 (nop_lift macros: ensure that we are using the right interner)
 - rust-lang#115908 (Do not clone MIR for const-prop lint.)
 - rust-lang#115916 (Add me as on vacation)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 0d29cdd into rust-lang:master Sep 18, 2023
11 checks passed
@rustbot rustbot added this to the 1.74.0 milestone Sep 18, 2023
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Sep 18, 2023
Rollup merge of rust-lang#115907 - RalfJung:interner-check, r=compiler-errors

nop_lift macros: ensure that we are using the right interner

Right now someone could put down the wrong list name when using these macros, and everything would still build. Nothing does a type-check to ensure that the `$set` contains element of type `Self::Lifted`. Let's fix that.

For lists this is fairly easy; for the other interners we need to unwrap some newtypes which makes this more complicated.
@RalfJung RalfJung deleted the interner-check branch September 19, 2023 08:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants