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

Don't prefix package name in _types package in VHDL (copy #1997) #1999

Merged
merged 1 commit into from
Nov 15, 2021

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 12, 2021

This is an automatic copy of pull request #1997 done by Mergify.
Cherry-pick of 5c6bf8b has failed:

On branch mergify/copy/1.2/pr-1997
Your branch is up to date with 'origin/1.2'.

You are currently cherry-picking commit 5c6bf8b0b.
  (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:
	new file:   changelog/2021-11-11T11_29_26+01_00_unqualify_package_body_vhdl.md
	new file:   tests/shouldwork/Issues/T1996.hs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   clash-lib/src/Clash/Backend/VHDL.hs
	deleted by us:   tests/Main.hs

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot added the conflicts label Nov 12, 2021
@alex-mckenna alex-mckenna force-pushed the mergify/copy/1.2/pr-1997 branch 2 times, most recently from 50d078c to b350c3f Compare November 12, 2021 12:41
Similar to ece7f26 for SystemVerilog, types should not appear
qualified in the package body for the types package in VHDL.

Fixes #1996.

NOTE: To avoid backporting the changes for compatibility with
prettyprinter-1.7.1, a more restrictive bound is set in this branch.

(cherry picked from commit 5c6bf8b)
@alex-mckenna alex-mckenna force-pushed the mergify/copy/1.2/pr-1997 branch from b350c3f to dfbca31 Compare November 12, 2021 14:18
@alex-mckenna
Copy link
Contributor

Pipelines don't report correctly on 1.2 anymore, but this succeeded on this pipeline: https://gitlab.com/clash-lang/clash-compiler/-/pipelines/407861240

@alex-mckenna alex-mckenna merged commit eb34d0c into 1.2 Nov 15, 2021
@alex-mckenna alex-mckenna deleted the mergify/copy/1.2/pr-1997 branch November 15, 2021 11:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant