Skip to content

Commit 071b158

Browse files
the-mikedavismergify[bot]
authored andcommitted
rabbit: Move include/{khepri.hrl => rabbit_khepri.hrl}
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)
1 parent bdb30ca commit 071b158

File tree

9 files changed

+8
-8
lines changed

9 files changed

+8
-8
lines changed

deps/rabbit/app.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ def all_srcs(name = "all_srcs"):
527527
"include/amqqueue.hrl",
528528
"include/amqqueue_v2.hrl",
529529
"include/internal_user.hrl",
530-
"include/khepri.hrl",
530+
"include/rabbit_khepri.hrl",
531531
"include/mc.hrl",
532532
"include/rabbit_amqp.hrl",
533533
"include/rabbit_global_counters.hrl",
File renamed without changes.

deps/rabbit/src/rabbit_db_exchange.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
-include_lib("khepri/include/khepri.hrl").
1111
-include_lib("rabbit_common/include/rabbit.hrl").
1212

13-
-include("include/khepri.hrl").
13+
-include("include/rabbit_khepri.hrl").
1414

1515
-export([
1616
get_all/0,

deps/rabbit/src/rabbit_db_maintenance.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
-include_lib("khepri/include/khepri.hrl").
1111
-include_lib("rabbit_common/include/rabbit.hrl").
1212

13-
-include("include/khepri.hrl").
13+
-include("include/rabbit_khepri.hrl").
1414

1515
-export([
1616
table_definitions/0,

deps/rabbit/src/rabbit_db_msup.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
-include_lib("khepri/include/khepri.hrl").
1111
-include("mirrored_supervisor.hrl").
1212

13-
-include("include/khepri.hrl").
13+
-include("include/rabbit_khepri.hrl").
1414

1515
-export([
1616
create_tables/0,

deps/rabbit/src/rabbit_db_rtparams.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
-include_lib("khepri/include/khepri.hrl").
1111
-include_lib("rabbit_common/include/rabbit.hrl").
1212

13-
-include("include/khepri.hrl").
13+
-include("include/rabbit_khepri.hrl").
1414

1515
-export([set/2, set/4,
1616
get/1,

deps/rabbit/src/rabbit_db_user.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
-include_lib("khepri/include/khepri.hrl").
1313
-include_lib("rabbit_common/include/rabbit.hrl").
1414

15-
-include("include/khepri.hrl").
15+
-include("include/rabbit_khepri.hrl").
1616

1717
-export([create/1,
1818
update/2,

deps/rabbit/src/rabbit_db_vhost.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
-include_lib("rabbit_common/include/logging.hrl").
1212
-include_lib("khepri/include/khepri.hrl").
1313

14-
-include("include/khepri.hrl").
14+
-include("include/rabbit_khepri.hrl").
1515
-include("vhost.hrl").
1616

1717
-export([create_or_get/3,

deps/rabbit/src/rabbit_khepri.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
-include_lib("rabbit_common/include/logging.hrl").
9797
-include_lib("rabbit_common/include/rabbit.hrl").
9898

99-
-include("include/khepri.hrl").
99+
-include("include/rabbit_khepri.hrl").
100100

101101
-export([setup/0,
102102
setup/1,

0 commit comments

Comments
 (0)