Skip to content

Commit b036614

Browse files
committed
Do not enable OTP feature at runtime
Since Erlang/OTP 26: ``` OTP-18445 Application(s): erts, stdlib It is no longer necessary to enable a feature in the runtime system in order to load modules that are using it. It is sufficient to enable the feature in the compiler when compiling it. That means that to use feature maybe_expr in Erlang/OTP 26, it is sufficient to enable it during compilation. In Erlang/OTP 27, feature maybe_expr will be enabled by default, but it will be possible to disable it. ```
1 parent f52c8e8 commit b036614

File tree

6 files changed

+1
-12
lines changed

6 files changed

+1
-12
lines changed

deps/rabbit/scripts/rabbitmq-server

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ start_rabbitmq_server() {
7777
-syslog logger '[]' \
7878
-syslog syslog_error_logger false \
7979
-kernel prevent_overlapping_partitions false \
80-
-enable-feature maybe_expr \
8180
"$@"
8281
}
8382

deps/rabbit/scripts/rabbitmq-server.bat

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ if "!RABBITMQ_ALLOW_INPUT!"=="" (
7171
-syslog logger [] ^
7272
-syslog syslog_error_logger false ^
7373
-kernel prevent_overlapping_partitions false ^
74-
-enable-feature maybe_expr ^
7574
!STAR!
7675

7776
if ERRORLEVEL 1 (

deps/rabbit/scripts/rabbitmq-service.bat

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,6 @@ set ERLANG_SERVICE_ARGUMENTS= ^
201201
-syslog logger [] ^
202202
-syslog syslog_error_logger false ^
203203
-kernel prevent_overlapping_partitions false ^
204-
-enable-feature maybe_expr ^
205204
!STARVAR!
206205

207206
set ERLANG_SERVICE_ARGUMENTS=!ERLANG_SERVICE_ARGUMENTS:\=\\!

deps/rabbitmq_mqtt/BUILD.bazel

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ load("@rules_erlang//:dialyze.bzl", "dialyze", "plt")
44
load(
55
"//:rabbitmq.bzl",
66
"BROKER_VERSION_REQUIREMENTS_ANY",
7-
"ENABLE_FEATURE_MAYBE_EXPR",
87
"RABBITMQ_DIALYZER_OPTS",
98
"assert_suites",
109
"broker_for_integration_suites",
@@ -118,7 +117,6 @@ eunit(
118117
":test_event_recorder_beam",
119118
":test_util_beam",
120119
],
121-
erl_extra_args = [ENABLE_FEATURE_MAYBE_EXPR],
122120
target = ":test_erlang_app",
123121
)
124122

erlang.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6667,8 +6667,7 @@ CT_RUN = ct_run \
66676667
-noinput \
66686668
-pa $(CURDIR)/ebin $(TEST_DIR) \
66696669
-dir $(TEST_DIR) \
6670-
-logdir $(CT_LOGS_DIR) \
6671-
-enable-feature maybe_expr
6670+
-logdir $(CT_LOGS_DIR)
66726671

66736672
ifeq ($(CT_SUITES),)
66746673
ct: $(if $(IS_APP)$(ROOT_DIR),,apps-ct)

rabbitmq.bzl

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ STARTS_BACKGROUND_BROKER_TAG = "starts-background-broker"
2222

2323
MIXED_VERSION_CLUSTER_TAG = "mixed-version-cluster"
2424

25-
ENABLE_FEATURE_MAYBE_EXPR = "-enable-feature maybe_expr"
26-
2725
RABBITMQ_ERLC_OPTS = DEFAULT_ERLC_OPTS + [
2826
"-DINSTR_MOD=gm",
2927
]
@@ -182,7 +180,6 @@ def rabbitmq_suite(
182180
ct_test(
183181
name = name,
184182
compiled_suites = [":{}_beam_files".format(name)] + additional_beam,
185-
ct_run_extra_args = [ENABLE_FEATURE_MAYBE_EXPR],
186183
data = native.glob(["test/{}_data/**/*".format(name)]) + data,
187184
test_env = dict({
188185
"RABBITMQ_CT_SKIP_AS_ERROR": "true",
@@ -242,7 +239,6 @@ def rabbitmq_integration_suite(
242239
suite_name = name,
243240
compiled_suites = [":{}_beam_files".format(name)] + additional_beam,
244241
tags = tags + [STARTS_BACKGROUND_BROKER_TAG],
245-
ct_run_extra_args = [ENABLE_FEATURE_MAYBE_EXPR],
246242
data = native.glob(["test/{}_data/**/*".format(name)]) + data,
247243
test_env = dict({
248244
"SKIP_MAKE_TEST_DIST": "true",
@@ -265,7 +261,6 @@ def rabbitmq_integration_suite(
265261
suite_name = name,
266262
compiled_suites = [":{}_beam_files".format(name)] + additional_beam,
267263
tags = tags + [STARTS_BACKGROUND_BROKER_TAG, MIXED_VERSION_CLUSTER_TAG],
268-
ct_run_extra_args = [ENABLE_FEATURE_MAYBE_EXPR],
269264
data = native.glob(["test/{}_data/**/*".format(name)]) + data,
270265
test_env = dict({
271266
"SKIP_MAKE_TEST_DIST": "true",

0 commit comments

Comments
 (0)