Skip to content

Revert problematic opaque type change#125489

Merged
bors merged 2 commits intorust-lang:masterfrom
oli-obk:revert_stuff_2
May 24, 2024
Merged

Revert problematic opaque type change#125489
bors merged 2 commits intorust-lang:masterfrom
oli-obk:revert_stuff_2

Conversation

@oli-obk
Copy link
Contributor

@oli-obk oli-obk commented May 24, 2024

fixes #124891
fixes #125192

reverts #123979

@oli-obk
Revert "Rollup merge of rust-lang#123979 - oli-obk:define_opaque_type…
56c135c 
…s7, r=compiler-errors"

This reverts commit f939d1f, reversing
changes made to 183c706.
@oli-obk oli-obk added the beta-nominated Nominated for backporting to the compiler in the beta channel. label May 24, 2024
@rustbot
Copy link
Collaborator

rustbot commented May 24, 2024

r? @BoxyUwU

rustbot has assigned @BoxyUwU.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@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 May 24, 2024
@compiler-errors
Copy link
Contributor

compiler-errors commented May 24, 2024

Please copy over the unminimized tests from the other PR, then r=me

@BoxyUwU BoxyUwU assigned compiler-errors and unassigned BoxyUwU May 24, 2024
@oli-obk
Copy link
Contributor Author

oli-obk commented May 24, 2024

copied over tests from #125447

@bors r=compiler-errors

@bors
Copy link
Collaborator

bors commented May 24, 2024

📌 Commit 669a823 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 May 24, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@oli-obk
Copy link
Contributor Author

oli-obk commented May 24, 2024

@bors r- -.-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 24, 2024
@oli-obk
Copy link
Contributor Author

oli-obk commented May 24, 2024

@bors r=compiler-errors

@bors
Copy link
Collaborator

bors commented May 24, 2024

📌 Commit 526090b 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 24, 2024
@oli-obk oli-obk mentioned this pull request May 24, 2024
Merged
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 24, 2024
@matthiaskrgr
Rollup merge of rust-lang#125489 - oli-obk:revert_stuff_2, r=compiler…
0ba9fc2 
…-errors

Revert problematic opaque type change

fixes rust-lang#124891
fixes rust-lang#125192

reverts rust-lang#123979
@matthiaskrgr matthiaskrgr mentioned this pull request May 24, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request May 24, 2024
@bors
Auto merge of rust-lang#125491 - matthiaskrgr:rollup-cjui9c0, r=matth…
14d3f59 
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#125455 (Make `clamp` inline)
 - rust-lang#125465 (bootstrap: vendor crates required by opt-dist to collect profiles )
 - rust-lang#125477 (Run rustfmt on files that need it.)
 - rust-lang#125481 (Fix the dead link in the bootstrap README)
 - rust-lang#125482 (Notify kobzol after changes to `opt-dist`)
 - rust-lang#125489 (Revert problematic opaque type change)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request May 24, 2024
@bors
Auto merge of rust-lang#125491 - matthiaskrgr:rollup-cjui9c0, r=matth…
3831324 
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#125455 (Make `clamp` inline)
 - rust-lang#125465 (bootstrap: vendor crates required by opt-dist to collect profiles )
 - rust-lang#125477 (Run rustfmt on files that need it.)
 - rust-lang#125481 (Fix the dead link in the bootstrap README)
 - rust-lang#125482 (Notify kobzol after changes to `opt-dist`)
 - rust-lang#125489 (Revert problematic opaque type change)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr matthiaskrgr mentioned this pull request May 24, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 24, 2024
@bors
Auto merge of rust-lang#125499 - matthiaskrgr:rollup-84i5z5w, r=matth…
ffa1862 
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#125455 (Make `clamp` inline)
 - rust-lang#125477 (Run rustfmt on files that need it.)
 - rust-lang#125481 (Fix the dead link in the bootstrap README)
 - rust-lang#125482 (Notify kobzol after changes to `opt-dist`)
 - rust-lang#125489 (Revert problematic opaque type change)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request May 24, 2024
@bors
Auto merge of rust-lang#125499 - matthiaskrgr:rollup-84i5z5w, r=matth…
697ac29 
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#125455 (Make `clamp` inline)
 - rust-lang#125477 (Run rustfmt on files that need it.)
 - rust-lang#125481 (Fix the dead link in the bootstrap README)
 - rust-lang#125482 (Notify kobzol after changes to `opt-dist`)
 - rust-lang#125489 (Revert problematic opaque type change)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 1a165ec into rust-lang:master May 24, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request May 24, 2024
@rust-timer
Unrolled build for rust-lang#125489
09e9d49 
Rollup merge of rust-lang#125489 - oli-obk:revert_stuff_2, r=compiler-errors

Revert problematic opaque type change

fixes rust-lang#124891
fixes rust-lang#125192

reverts rust-lang#123979
@rustbot rustbot added this to the 1.80.0 milestone May 24, 2024
This was referenced May 24, 2024
Closed
Closed
@apiraino
Copy link
Contributor

apiraino commented Jun 5, 2024

Beta backport accepted as per compiler team on Zulip. A backport PR will be authored by the release team at the end of the current development cycle.

@rustbot label +beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jun 5, 2024
@oli-obk oli-obk deleted the revert_stuff_2 branch June 5, 2024 15:27
@cuviper cuviper mentioned this pull request Jun 6, 2024
Merged
@cuviper cuviper modified the milestones: 1.80.0, 1.79.0 Jun 6, 2024
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jun 6, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 7, 2024
@bors
Auto merge of rust-lang#126093 - cuviper:beta-next, r=cuviper
49f3109 
[beta] backports

- Fix insufficient logic when searching for the underlying allocation rust-lang#124761
- Handle field projections like slice indexing in invalid_reference_casting rust-lang#124908
- Handle Deref expressions in invalid_reference_casting rust-lang#124978
- Fix ICE in non-operand `aggregate_raw_ptr` instrinsic codegen rust-lang#125184
- Wrap Context.ext in AssertUnwindSafe rust-lang#125392
- Revert problematic opaque type change rust-lang#125489
- ast: Revert a breaking attribute visiting order change rust-lang#125734
- Update to LLVM 18.1.7 rust-lang#126061

r? cuviper
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 7, 2024
@bors
Auto merge of rust-lang#126093 - cuviper:beta-next, r=cuviper
f4d7315 
[beta] backports

- Fix insufficient logic when searching for the underlying allocation rust-lang#124761
- Handle field projections like slice indexing in invalid_reference_casting rust-lang#124908
- Handle Deref expressions in invalid_reference_casting rust-lang#124978
- Fix ICE in non-operand `aggregate_raw_ptr` instrinsic codegen rust-lang#125184
- Wrap Context.ext in AssertUnwindSafe rust-lang#125392
- Revert problematic opaque type change rust-lang#125489
- ast: Revert a breaking attribute visiting order change rust-lang#125734
- Update to LLVM 18.1.7 rust-lang#126061
- Revert "Disallow ambiguous attributes on expressions" on beta rust-lang#126102 / rust-lang#126101
- Silence double-symlink errors while building solaris toolchain rust-lang#126011

r? cuviper
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 7, 2024
@bors
Auto merge of rust-lang#126093 - cuviper:beta-next, r=cuviper
7bb6510 
[beta] backports

- Fix insufficient logic when searching for the underlying allocation rust-lang#124761
- Handle field projections like slice indexing in invalid_reference_casting rust-lang#124908
- Handle Deref expressions in invalid_reference_casting rust-lang#124978
- Fix ICE in non-operand `aggregate_raw_ptr` instrinsic codegen rust-lang#125184
- Wrap Context.ext in AssertUnwindSafe rust-lang#125392
- Revert problematic opaque type change rust-lang#125489
- ast: Revert a breaking attribute visiting order change rust-lang#125734
- Update to LLVM 18.1.7 rust-lang#126061
- Revert "Disallow ambiguous attributes on expressions" on beta rust-lang#126102 / rust-lang#126101
- Silence double-symlink errors while building solaris toolchain rust-lang#126011

r? cuviper
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@compiler-errors compiler-errors compiler-errors approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@compiler-errors compiler-errors

Labels

beta-accepted Accepted for backporting to the compiler in the beta channel. 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

Milestone

1.79.0

8 participants

@oli-obk @rustbot @compiler-errors @bors @rust-log-analyzer @apiraino @cuviper @BoxyUwU