Skip to content

Definitions: fix queue type (backport #14764) (backport #14785) #14788

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
Closed
wants to merge 1 commit into from
Closed

Definitions: fix queue type (backport #14764) (backport #14785) #14788

wants to merge 1 commit into from

Conversation

@mergify
Copy link

@mergify mergify bot commented Oct 23, 2025

lookup_type_name returns a tagged tuple {ok, Type}, which was stored directly on the type field.
This PR just stores the type.

This is an automatic backport of pull request #14764 done by [Mergify](https://mergify.com).
This is an automatic backport of pull request #14785 done by [Mergify](https://mergify.com).

@dcorbacho @mergify
Definitions: fix queue type
6c0cf0c 
`lookup_type_name` returns a tagged tuple `{ok, Type}`

(cherry picked from commit 088c8e6)
(cherry picked from commit ae31a44)

# Conflicts:
#	deps/rabbit/src/rabbit_definitions.erl
@mergify
Copy link
Author

mergify bot commented Oct 23, 2025

Cherry-pick of ae31a44 has failed:

On branch mergify/bp/v4.1.x/pr-14785
Your branch is up to date with 'origin/v4.1.x'.

You are currently cherry-picking commit ae31a444b.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbit/src/rabbit_definitions.erl

no changes added to commit (use "git add" and/or "git commit -a")

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

@mergify mergify bot added the conflicts label Oct 23, 2025
@michaelklishin
Copy link
Collaborator

michaelklishin commented Oct 23, 2025

While resolving the conflict I've realized that v4.1.x is not affected but merging the v4.2.x version means queue type values that are modules will fail, e.g.

gmake ct-definition_import t=roundtrip

will.

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

conflicts

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@michaelklishin @dcorbacho