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 "Disallow ambiguous attributes on expressions" on nightly #126101

Merged
merged 1 commit into from
Jun 7, 2024

Conversation

lqd
Copy link
Member

@lqd lqd commented Jun 6, 2024

As discussed in today's t-compiler meeting, this reverts PR #124099 to fix P-critical beta regressions #125199.

r? @wesleywiser

Opening as draft so that @wesleywiser and @apiraino, you can tell me whether you wanted:

  1. a beta-accepted revert of Disallow ambiguous attributes on expressions #124099 on nightly (this PR)? That will need to be backported to beta (even though [beta] backports #126093 may be the last of those)
  2. a revert of Disallow ambiguous attributes on expressions #124099 on beta?
  3. all of the above?

I also opened #126102, another draft PR to revert #124099 on beta, should you choose options 2 or 3.

…xpr-attrs, r=davidtwco"

This reverts commit 57dad1d, reversing
changes made to 36316df.
@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 Jun 6, 2024
@wesleywiser wesleywiser marked this pull request as ready for review June 6, 2024 22:30
@rustbot
Copy link
Collaborator

rustbot commented Jun 6, 2024

Some changes occurred in src/tools/rustfmt

cc @rust-lang/rustfmt

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

@wesleywiser
Copy link
Member

Thanks @lqd! I think we need to go with option 3: landing the revert on both nightly and beta.

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jun 6, 2024

📌 Commit 216424d has been approved by wesleywiser

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 Jun 6, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 7, 2024
[beta] Revert "Disallow ambiguous attributes on expressions" on beta

As discussed in [today's t-compiler meeting](https://rust-lang.zulipchat.com/#narrow/stream/238009-t-compiler.2Fmeetings/topic/.5Bweekly.5D.202024-06-06/near/443079505), this reverts PR rust-lang#124099 on beta to fix P-critical beta regressions rust-lang#125199.

r? `@wesleywiser`

This is the revert of rust-lang#124099 on beta that I mentioned in rust-lang#126101, in case that's what you also wanted. Opening as draft in case it's not.

I'm not well-versed in these backports, so I hope I did it right 😓
@cuviper cuviper mentioned this pull request Jun 7, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 7, 2024
[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
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Jun 7, 2024
Revert "Disallow ambiguous attributes on expressions" on nightly

As discussed in [today's t-compiler meeting](https://rust-lang.zulipchat.com/#narrow/stream/238009-t-compiler.2Fmeetings/topic/.5Bweekly.5D.202024-06-06/near/443079505), this reverts PR rust-lang#124099 to fix P-critical beta regressions rust-lang#125199.

r? `@wesleywiser`

Opening as draft so that `@wesleywiser` and `@apiraino,` you can tell me whether you wanted:
1. a `beta-accepted` revert of rust-lang#124099 on nightly (this PR)? That will need to be backported to beta (even though rust-lang#126093 may be the last of those)
2. a revert of rust-lang#124099 on beta?
3. all of the above?

I also opened rust-lang#126102, another draft PR to revert rust-lang#124099 on beta, should you choose options 2 or 3.
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 7, 2024
…kingjubilee

Rollup of 8 pull requests

Successful merges:

 - rust-lang#125606 (Size optimize int formatting)
 - rust-lang#125724 (Uplift `Relate`/`TypeRelation` into `rustc_next_trait_solver`)
 - rust-lang#126040 (Don't warn on fields in the `unreachable_pub` lint )
 - rust-lang#126065 (mark binding undetermined if target name exist and not obtained)
 - rust-lang#126098 (Remove `same-lib-two-locations-no-panic` run-make test)
 - rust-lang#126099 (Crate loader cleanups)
 - rust-lang#126101 (Revert "Disallow ambiguous attributes on expressions" on nightly)
 - rust-lang#126103 (Improve Docs for `hir::Impl` and `hir::ImplItem`)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 7, 2024
…kingjubilee

Rollup of 7 pull requests

Successful merges:

 - rust-lang#125606 (Size optimize int formatting)
 - rust-lang#125724 (Uplift `Relate`/`TypeRelation` into `rustc_next_trait_solver`)
 - rust-lang#126040 (Don't warn on fields in the `unreachable_pub` lint )
 - rust-lang#126098 (Remove `same-lib-two-locations-no-panic` run-make test)
 - rust-lang#126099 (Crate loader cleanups)
 - rust-lang#126101 (Revert "Disallow ambiguous attributes on expressions" on nightly)
 - rust-lang#126103 (Improve Docs for `hir::Impl` and `hir::ImplItem`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit b1ab8d5 into rust-lang:master Jun 7, 2024
6 checks passed
@rustbot rustbot added this to the 1.80.0 milestone Jun 7, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jun 7, 2024
Rollup merge of rust-lang#126101 - lqd:revert-124099, r=wesleywiser

Revert "Disallow ambiguous attributes on expressions" on nightly

As discussed in [today's t-compiler meeting](https://rust-lang.zulipchat.com/#narrow/stream/238009-t-compiler.2Fmeetings/topic/.5Bweekly.5D.202024-06-06/near/443079505), this reverts PR rust-lang#124099 to fix P-critical beta regressions rust-lang#125199.

r? ``@wesleywiser``

Opening as draft so that ``@wesleywiser`` and ``@apiraino,`` you can tell me whether you wanted:
1. a `beta-accepted` revert of rust-lang#124099 on nightly (this PR)? That will need to be backported to beta (even though rust-lang#126093 may be the last of those)
2. a revert of rust-lang#124099 on beta?
3. all of the above?

I also opened rust-lang#126102, another draft PR to revert rust-lang#124099 on beta, should you choose options 2 or 3.
@lqd lqd deleted the revert-124099 branch June 7, 2024 09:42
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 7, 2024
[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
flip1995 pushed a commit to flip1995/rust that referenced this pull request Jun 13, 2024
Revert "Disallow ambiguous attributes on expressions" on nightly

As discussed in [today's t-compiler meeting](https://rust-lang.zulipchat.com/#narrow/stream/238009-t-compiler.2Fmeetings/topic/.5Bweekly.5D.202024-06-06/near/443079505), this reverts PR rust-lang#124099 to fix P-critical beta regressions rust-lang#125199.

r? ``@wesleywiser``

Opening as draft so that ``@wesleywiser`` and ``@apiraino,`` you can tell me whether you wanted:
1. a `beta-accepted` revert of rust-lang#124099 on nightly (this PR)? That will need to be backported to beta (even though rust-lang#126093 may be the last of those)
2. a revert of rust-lang#124099 on beta?
3. all of the above?

I also opened rust-lang#126102, another draft PR to revert rust-lang#124099 on beta, should you choose options 2 or 3.
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.

4 participants