Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix missing string interpolators, add -Xlint:missing-interpolator (backport #4471) #4473

Merged
merged 3 commits into from
Nov 25, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 16, 2024

We hit an internal error and it isn't useful because of missing String interpolators. Fix that

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

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 #4471 done by [Mergify](https://mergify.com).

)

(cherry picked from commit ca773c0)

# Conflicts:
#	build.sc
#	core/src/main/scala/chisel3/Aggregate.scala
#	core/src/main/scala/chisel3/experimental/hierarchy/core/Hierarchy.scala
#	core/src/main/scala/chisel3/experimental/hierarchy/core/Instance.scala
@mergify mergify bot added Backport Automated backport, please consider for minor release bp-conflict labels Oct 16, 2024
Copy link
Contributor Author

mergify bot commented Oct 16, 2024

Cherry-pick of ca773c0 has failed:

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

You are currently cherry-picking commit ca773c08a.
  (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:   core/src/main/scala/chisel3/connectable/Connection.scala
	modified:   core/src/main/scala/chisel3/experimental/hierarchy/core/Lookupable.scala
	modified:   src/main/scala/chisel3/aop/Select.scala
	modified:   src/main/scala/chisel3/util/experimental/decode/QMCMinimizer.scala
	modified:   src/main/scala/circt/stage/phases/CIRCT.scala

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   build.sc
	both modified:   core/src/main/scala/chisel3/Aggregate.scala
	both modified:   core/src/main/scala/chisel3/experimental/hierarchy/core/Hierarchy.scala
	both modified:   core/src/main/scala/chisel3/experimental/hierarchy/core/Instance.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 Oct 16, 2024
@chiselbot chiselbot merged commit e339593 into 6.x Nov 25, 2024
15 checks passed
@chiselbot chiselbot deleted the mergify/bp/6.x/pr-4471 branch November 25, 2024 21:36
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
Backport Automated backport, please consider for minor release Bugfix Fixes a bug, will be included in release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants