Skip to content

Add Param and Bound ty to SMIR #113930

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 2 commits into from
Jul 26, 2023
Merged

Add Param and Bound ty to SMIR #113930

merged 2 commits into from
Jul 26, 2023

Conversation

spastorino
Copy link
Member

@spastorino spastorino commented Jul 21, 2023

@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 Jul 21, 2023
@rustbot
Copy link
Collaborator

rustbot commented Jul 21, 2023

This PR changes Stable MIR

cc @oli-obk, @celinval, @spastorino

@spastorino spastorino changed the title Add Param and Bound ty to SMIT Add Param and Bound ty to SMIR Jul 21, 2023
@bors
Copy link
Collaborator

bors commented Jul 23, 2023

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

@bors
Copy link
Collaborator

bors commented Jul 24, 2023

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

@bors
Copy link
Collaborator

bors commented Jul 26, 2023

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

@@ -18,6 +18,8 @@ type Span = Opaque;
pub enum TyKind {
RigidTy(RigidTy),
Alias(AliasKind, AliasTy),
Param(ParamTy),
Bound(usize, BoundTy),
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe make this a struct variant and give names to the fields.

@oli-obk
Copy link
Contributor

oli-obk commented Jul 26, 2023

@bors r+ rollup

@spastorino said they'd follow up with doing such changes across the board instead of just in this instance

@bors
Copy link
Collaborator

bors commented Jul 26, 2023

📌 Commit 7af1697 has been approved by oli-obk

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 Jul 26, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 26, 2023
Add Param and Bound ty to SMIR

r? `@oli-obk`
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 26, 2023
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#101994 (rand: freebsd update, using getrandom.)
 - rust-lang#113930 (Add Param and Bound ty to SMIR)
 - rust-lang#113942 (Squelch a noisy rustc_expand unittest)
 - rust-lang#113996 (Define CMAKE_SYSTEM_NAME on a cross build targeting DragonFly.)
 - rust-lang#114070 (Add `sym::iter_mut` + `sym::as_mut_ptr` for Clippy)
 - rust-lang#114073 (Remove -Z diagnostic-width)
 - rust-lang#114090 (compiletest: remove ci-specific remap-path-prefix)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit d910e7d into rust-lang:master Jul 26, 2023
@rustbot rustbot added this to the 1.73.0 milestone Jul 26, 2023
# for free to join this conversation on GitHub. Already have an account? # 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.

4 participants