Skip to content

Reverts check done by #100757#104610

Merged
bors merged 3 commits intorust-lang:masterfrom
ouz-a:revert-overflow
Nov 24, 2022
Merged

Reverts check done by #100757#104610
bors merged 3 commits intorust-lang:masterfrom
ouz-a:revert-overflow

Conversation

@ouz-a
Copy link
Contributor

@ouz-a ouz-a commented Nov 19, 2022 •
edited by compiler-errors
Loading

As my fix caused more issues than it resolved it's better to revert it.
( #103274 #104322 #104606)

r? @compiler-errors

Reverts #100757
Reopens #95134

@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 Nov 19, 2022
compiler-errors
compiler-errors reviewed Nov 19, 2022
View reviewed changes
src/test/ui/recursion/issue-95134.rs
@@ -1,28 +0,0 @@
// build-fail
Copy link
Contributor

@compiler-errors compiler-errors Nov 19, 2022

Choose a reason for hiding this comment

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

This should be kept. If it ICEs, then it can be tagged as // known-bug: #### and you need to add // failure-status: 101 and // dont-check-compiler-stderr to account for the ICE.

@compiler-errors compiler-errors mentioned this pull request Nov 22, 2022
Closed
@compiler-errors
Copy link
Contributor

compiler-errors commented Nov 22, 2022

@bors r+ rollup=never

@bors
Copy link
Collaborator

bors commented Nov 22, 2022

📌 Commit 701970e 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 Nov 22, 2022
@WaffleLapkin
Copy link
Member

WaffleLapkin commented Nov 22, 2022

If this fixes the mentioned issues, shouldn't this also add tests for them?

@compiler-errors
Copy link
Contributor

compiler-errors commented Nov 23, 2022

If this fixes the mentioned issues, shouldn't this also add tests for them?

Ideally yes, but none of them have minimizations 🤷

They seem like pretty large projects too, and #104606 is from a private codebase 😢

@bors
Copy link
Collaborator

bors commented Nov 24, 2022

⌛ Testing commit 701970e with merge fd815a5...

@bors
Copy link
Collaborator

bors commented Nov 24, 2022

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing fd815a5 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 24, 2022
@bors bors merged commit fd815a5 into rust-lang:master Nov 24, 2022
@rustbot rustbot added this to the 1.67.0 milestone Nov 24, 2022
@rust-timer
Copy link
Collaborator

rust-timer commented Nov 24, 2022

Finished benchmarking commit (fd815a5): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 0.4% [0.4%, 0.4%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 3.5% [3.5%, 3.5%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -0.8% [-0.8%, -0.8%] 1
All ❌✅ (primary) - - 0

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 2.5% [2.3%, 2.9%] 3
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

@weiznich
Copy link
Contributor

weiznich commented Nov 24, 2022

@compiler-errors #104606 is not really related to this fix. It's a ICE not a type check regression. It only mentions #104322 as that error forces me to use 1.64. For #104322 I've provided a reproducible example, although that's definitively not minimal due to using diesel and wundergraph.

This was referenced Nov 24, 2022
Closed
Closed
@matthiaskrgr
Copy link
Member

matthiaskrgr commented Nov 24, 2022

This also reopens #92004 and #92470 which now crash again

@compiler-errors compiler-errors added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Nov 26, 2022
@compiler-errors
Copy link
Contributor

compiler-errors commented Nov 26, 2022

Nominating for beta backport discussion. It really sucks we don't have a MCVE for the test suite for this, but given that this is a PR revert and not adding new logic, it's less risky, I feel. Anyways, we should discuss this regardless.

@apiraino
Copy link
Contributor

apiraino commented Dec 1, 2022

Beta backport accepted as per compiler team on Zulip

@rustbot label +beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Dec 1, 2022
@pnkfelix pnkfelix mentioned this pull request Dec 9, 2022
Closed
@emilyalbini emilyalbini removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Dec 11, 2022
@emilyalbini emilyalbini mentioned this pull request Dec 11, 2022
Merged
@ouz-a ouz-a deleted the revert-overflow branch December 12, 2022 13:54
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 12, 2022
@bors
Auto merge of rust-lang#105563 - pietroalbini:pa-stable-1.66.0, r=pie…
69f9c33 
…troalbini

[stable] Prepare 1.66.0 release

This PR prepares the artifacts for the 1.66.0 release. The following PRs have been backported:

* rust-lang#104782
* rust-lang#105023
* rust-lang#104558
* rust-lang#104610
* rust-lang#103989
* rust-lang#104650
* rust-lang#105539
* rust-lang#105477

r? `@ghost`
Aaron1011 pushed a commit to Aaron1011/rust that referenced this pull request Jan 6, 2023
@bors
Auto merge of rust-lang#104610 - ouz-a:revert-overflow, r=compiler-er…
7edf87a 
…rors

Reverts check done by rust-lang#100757

As my `fix` caused more issues than it resolved it's better to revert it.
( rust-lang#103274 rust-lang#104322 rust-lang#104606)

r? `@compiler-errors`

Reopens rust-lang#95134
@matthiaskrgr matthiaskrgr mentioned this pull request Jul 17, 2023
Closed
@matthiaskrgr matthiaskrgr mentioned this pull request Nov 11, 2023
Closed
@compiler-errors compiler-errors mentioned this pull request Mar 21, 2024
Closed
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 left review comments

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. merged-by-bors This PR was explicitly merged by bors. 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.67.0

Development

Successfully merging this pull request may close these issues.

10 participants

@ouz-a @compiler-errors @bors @WaffleLapkin @rust-timer @weiznich @matthiaskrgr @apiraino @emilyalbini @rustbot