Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Nov 22, 2024

This is two mostly cosmetic refactors:

  • Move include/khepri.hrl to include/rabbit_khepri.hrl in rabbit. This helps ErlangLS find the header. It seems to confuse this header with one of the same name from khepri itself.
  • Use preprocessor macros for building path patterns. This isn't a meaningful change yet but will be used in the future to pattern match on paths in a khepri_adv:node_props_map().
    This is an automatic backport of pull request 4.1.x: Use preprocessor macros for building Khepri path patterns #12723 done by Mergify.

This fixes erlang_ls's header resolution. Previously it would confuse
the include_lib of the `khepri.hrl` from Khepri with this header in
the rabbit app.

This header is also specific to how rabbit uses Khepri so I think the
new name fits better.

(cherry picked from commit e8fb9b6)
@mergify mergify bot added the bazel label Nov 22, 2024
@the-mikedavis the-mikedavis changed the title 4.1.x: Use preprocessor macros for building Khepri path patterns (backport #12723) 4.0.x: Use preprocessor macros for building Khepri path patterns (backport #12723) Nov 22, 2024
@the-mikedavis the-mikedavis added this to the 4.0.5 milestone Nov 22, 2024
@the-mikedavis the-mikedavis merged commit 62cf19f into v4.0.x Nov 22, 2024
235 checks passed
@the-mikedavis the-mikedavis deleted the mergify/bp/v4.0.x/pr-12723 branch November 22, 2024 19:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants