Skip to content

Fix === for abstract Reset types (backport #3979) #3980

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Apr 9, 2024
Merged

Fix === for abstract Reset types (backport #3979) #3980

merged 2 commits into from
Apr 9, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 9, 2024 •
edited by github-actions bot
Loading

Contributor Checklist

  • Did you add Scaladoc to every public function/method?
  • Did you add at least one test demonstrating the PR?
  • Did you delete any extraneous printlns/debugging code?
  • Did you specify the type of improvement?
  • Did you add appropriate documentation in docs/src?
  • Did you request a desired merge strategy?
  • Did you add text to be included in the Release Notes for this change?

Type of Improvement

  • Bugfix

Desired Merge Strategy

  • Squash

Release Notes

Previously, the function would infinitely recurse resulting in a stack overflow.

Reviewer Checklist (only modified by reviewer)

  • Did you add the appropriate labels? (Select the most appropriate one based on the "Type of Improvement")
  • Did you mark the proper milestone (Bug fix: 3.6.x, 5.x, or 6.x depending on impact, API modification or big change: 7.0)?
  • Did you review?
  • Did you check whether all relevant Contributor checkboxes have been checked?
  • Did you do one of the following when ready to merge:
    • Squash: You/ the contributor Enable auto-merge (squash), clean up the commit message, and label with Please Merge.
    • Merge: Ensure that contributor has cleaned up their commit history, then merge with Create a merge commit.
This is an automatic backport of pull request #3979 done by [Mergify](https://mergify.com).

Original PR Body

Contributor Checklist

  • Did you add Scaladoc to every public function/method?
  • Did you add at least one test demonstrating the PR?
  • Did you delete any extraneous printlns/debugging code?
  • Did you specify the type of improvement?
  • Did you add appropriate documentation in docs/src?
  • Did you request a desired merge strategy?
  • Did you add text to be included in the Release Notes for this change?

Type of Improvement

  • Bugfix

Desired Merge Strategy

  • Squash

Release Notes

Previously, the function would infinitely recurse resulting in a stack overflow.

Reviewer Checklist (only modified by reviewer)

  • Did you add the appropriate labels? (Select the most appropriate one based on the "Type of Improvement")
  • Did you mark the proper milestone (Bug fix: 3.6.x, 5.x, or 6.x depending on impact, API modification or big change: 7.0)?
  • Did you review?
  • Did you check whether all relevant Contributor checkboxes have been checked?
  • Did you do one of the following when ready to merge:
    • Squash: You/ the contributor Enable auto-merge (squash), clean up the commit message, and label with Please Merge.
    • Merge: Ensure that contributor has cleaned up their commit history, then merge with Create a merge commit.

@jackkoenig @mergify
Fix === for abstract Reset types (#3979)
4dd53da 
Previously, the function would infinitely recurse resulting in a stack
overflow.

(cherry picked from commit ea2d103)

# Conflicts:
#	core/src/main/scala/chisel3/Data.scala
@mergify mergify bot added Backport Automated backport, please consider for minor release bp-conflict labels Apr 9, 2024
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Apr 9, 2024

Cherry-pick of ea2d103 has failed:

On branch mergify/bp/3.6.x/pr-3979
Your branch is up to date with 'origin/3.6.x'.

You are currently cherry-picking commit ea2d10365.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/test/scala/chiselTests/DataEqualitySpec.scala

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/src/main/scala/chisel3/Data.scala

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@github-actions github-actions bot added the Bugfix Fixes a bug, will be included in release notes label Apr 9, 2024
@chiselbot chiselbot merged commit 3926710 into 3.6.x Apr 9, 2024
@chiselbot chiselbot deleted the mergify/bp/3.6.x/pr-3979 branch April 9, 2024 23:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Backport Automated backport, please consider for minor release Bugfix Fixes a bug, will be included in release notes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jackkoenig @chiselbot