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

Revert #113923 #119885

Merged
merged 2 commits into from
Jan 12, 2024
Merged

Revert #113923 #119885

merged 2 commits into from
Jan 12, 2024

Conversation

DianQK
Copy link
Member

@DianQK DianQK commented Jan 12, 2024

Per #t-compiler/meetings > [weekly] 2024-01-11 discussion, revert #113923. Also revert associated #118568.

The PR #113923 causes the regression issue #118609. We need more time to find a proper solution.

Discussions start at 412365838 and continue to 412369643.

Fixes #118609.

r? compiler

…r=pnkfelix"

This reverts commit 503e129, reversing
changes made to 0e7f91b.
…to, r=pnkfelix"

This reverts commit 8c2b577, reversing
changes made to 9cf18e9.
@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 Jan 12, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jan 12, 2024

The Miri subtree was changed

cc @rust-lang/miri

@DianQK DianQK mentioned this pull request Jan 12, 2024
@RalfJung
Copy link
Member

RalfJung commented Jan 12, 2024

Per #t-compiler/meetings > [weekly] 2024-01-11 discussion

That's a long Zulip thread discussing a dozen different things. Would be good to at least mention the concrete issue being fixed here and to link to the specifically relevant part of that discussion.

@DianQK
Copy link
Member Author

DianQK commented Jan 12, 2024

Per #t-compiler/meetings > [weekly] 2024-01-11 discussion

That's a long Zulip thread discussing a dozen different things. Would be good to at least mention the concrete issue being fixed here and to link to the specifically relevant part of that discussion.

Thanks. I have added.

@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Jan 12, 2024

📌 Commit aa874c5 has been approved by petrochenkov

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 Jan 12, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 12, 2024
…llaumeGomez

Rollup of 6 pull requests

Successful merges:

 - rust-lang#119817 (Remove special-casing around `AliasKind::Opaque` when structurally resolving in new solver)
 - rust-lang#119819 (Check rust lints when an unknown lint is detected)
 - rust-lang#119872 (Give me a way to emit all the delayed bugs as errors (add `-Zeagerly-emit-delayed-bugs`))
 - rust-lang#119877 (Add more information to `visit_projection_elem`)
 - rust-lang#119884 (Rename `--env` option flag to `--env-set`)
 - rust-lang#119885 (Revert rust-lang#113923)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit dafbe17 into rust-lang:master Jan 12, 2024
11 checks passed
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 12, 2024
Rollup merge of rust-lang#119885 - DianQK:revert-pr-113923, r=petrochenkov

Revert rust-lang#113923

Per [#t-compiler/meetings > [weekly] 2024-01-11](https://rust-lang.zulipchat.com/#narrow/stream/238009-t-compiler.2Fmeetings/topic/.5Bweekly.5D.202024-01-11) discussion, revert rust-lang#113923. Also revert associated rust-lang#118568.

The PR rust-lang#113923 causes the regression issue rust-lang#118609. We need more time to find a proper solution.

Discussions start at [412365838](https://rust-lang.zulipchat.com/#narrow/stream/238009-t-compiler.2Fmeetings/topic/.5Bweekly.5D.202024-01-11/near/412365838) and continue to [412369643](https://rust-lang.zulipchat.com/#narrow/stream/238009-t-compiler.2Fmeetings/topic/.5Bweekly.5D.202024-01-11/near/412369643).

Fixes rust-lang#118609.

r? compiler
@rustbot rustbot added this to the 1.77.0 milestone Jan 12, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 20, 2024
@DianQK DianQK deleted the revert-pr-113923 branch January 23, 2024 05:04
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.

🐛 Symbol multiply defined since nightly-2023-12-02 with custom builtins.
5 participants