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 "Rollup merge of #97346 - JohnTitor:remove-back-compat-hacks, … #99860

Merged
merged 1 commit into from
Aug 18, 2022

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Jul 28, 2022

…r=oli-obk"

This reverts commit c703d11, reversing
changes made to 64eb9ab.

it didn't apply cleanly, so now it works the same for RPIT and for TAIT instead of just working for RPIT, but we should keep those in sync anyway. It also exposed a TAIT bug (see the feature gated test that now ICEs).

r? @pnkfelix

fixes #99536

…t-hacks, r=oli-obk"

This reverts commit c703d11, reversing
changes made to 64eb9ab.
@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jul 28, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 28, 2022
@compiler-errors
Copy link
Member

compiler-errors commented Aug 11, 2022

cc @rust-lang/types
this is now a regression from stable to beta

@compiler-errors compiler-errors added regression-from-stable-to-beta Performance or correctness regression from stable to beta. beta-nominated Nominated for backporting to the compiler in the beta channel. labels Aug 11, 2022
@rustbot rustbot added the I-prioritize Issue: Indicates that prioritization has been requested for this issue. label Aug 11, 2022
@compiler-errors compiler-errors removed the I-prioritize Issue: Indicates that prioritization has been requested for this issue. label Aug 11, 2022
@lcnr
Copy link
Contributor

lcnr commented Aug 13, 2022

@pnkfelix do you want to sign this off?

otherwise r=me I guess 😁 do we have an open issue for the new feature-gated ICE?
I guess we just have to open #86800 again?

@pnkfelix
Copy link
Member

@bors r+ p=100

@bors
Copy link
Contributor

bors commented Aug 18, 2022

📌 Commit a85eb3d has been approved by pnkfelix

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 Aug 18, 2022
@pnkfelix
Copy link
Member

@rustbot label: beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Aug 18, 2022
@bors
Copy link
Contributor

bors commented Aug 18, 2022

⌛ Testing commit a85eb3d with merge 8064a49...

@bors
Copy link
Contributor

bors commented Aug 18, 2022

☀️ Test successful - checks-actions
Approved by: pnkfelix
Pushing 8064a49 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 18, 2022
@bors bors merged commit 8064a49 into rust-lang:master Aug 18, 2022
@rustbot rustbot added this to the 1.65.0 milestone Aug 18, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (8064a49): comparison url.

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results
  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: mixed results
mean1 max count2
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
2.2% 2.2% 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-3.3% -3.3% 2
All ❌✅ (primary) - - 0

Cycles

Results
  • Primary benchmarks: mixed results
  • Secondary benchmarks: ❌ relevant regression found
mean1 max count2
Regressions ❌
(primary)
2.6% 2.6% 1
Regressions ❌
(secondary)
3.4% 3.4% 1
Improvements ✅
(primary)
-2.6% -2.6% 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.0% -2.6% 2

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

Footnotes

  1. the arithmetic mean of the percent change 2

  2. number of relevant changes 2

@oli-obk oli-obk deleted the revert_97346 branch August 22, 2022 08:06
ehuss pushed a commit to ehuss/rust that referenced this pull request Aug 31, 2022
Revert "Rollup merge of rust-lang#97346 - JohnTitor:remove-back-compat-hacks, …

…r=oli-obk"

This reverts commit c703d11, reversing
changes made to 64eb9ab.

it didn't apply cleanly, so now it works the same for RPIT and for TAIT instead of just working for RPIT, but we should keep those in sync anyway. It also exposed a TAIT bug (see the feature gated test that now ICEs).

r? `@pnkfelix`

fixes rust-lang#99536
@ehuss ehuss removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Aug 31, 2022
@ehuss ehuss modified the milestones: 1.65.0, 1.64.0 Aug 31, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 31, 2022
[BETA] Beta 1.64 backports

* Cargo:
    * remove missed reference to workspace inheritance in unstable.md (rust-lang/cargo#11002)
* Delay formatting trimmed path until lint/error is emitted rust-lang#99893
* Use `node_type_opt` to skip over generics that were not expected rust-lang#100155
* Revert "Remove a back-compat hack on lazy TAIT rust-lang#97346" rust-lang#99860
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. merged-by-bors This PR was explicitly merged by bors. regression-from-stable-to-beta Performance or correctness regression from stable to beta. 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.

nightly 2022-06-29 rejects previously compiling code with missing trait implementations
9 participants