Skip to content

Commit 5187dd1

Browse files
committed
Align internal and external encoding option names with the standard Ruby option names
1 parent a28f86d commit 5187dd1

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

src/launcher/java/org/truffleruby/launcher/RubyLauncher.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ protected void collectArguments(Set<String> options) {
158158
"-x",
159159
"--copyright",
160160
"--enable", "--disable",
161-
"--external-encoding", "--internal-encoding",
162161
"--version"));
163162
}
164163

src/main/java/org/truffleruby/options/Options.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,9 +303,9 @@ public Object fromDescription(OptionDescription<?> description) {
303303
return VERBOSITY;
304304
case "ruby.source_encoding":
305305
return SOURCE_ENCODING;
306-
case "ruby.internal_encoding":
306+
case "ruby.internal-encoding":
307307
return INTERNAL_ENCODING;
308-
case "ruby.external_encoding":
308+
case "ruby.external-encoding":
309309
return EXTERNAL_ENCODING;
310310
case "ruby.home":
311311
return HOME;

src/shared/java/org/truffleruby/shared/options/OptionsCatalog.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ public class OptionsCatalog {
5656
"");
5757
public static final StringOptionDescription INTERNAL_ENCODING = new StringOptionDescription(
5858
OptionCategory.USER,
59-
"ruby.internal_encoding",
59+
"ruby.internal-encoding",
6060
"Internal encoding (configured by the -E, -U Ruby options)",
6161
new String[]{"-E", "-U"},
6262
"");
6363
public static final StringOptionDescription EXTERNAL_ENCODING = new StringOptionDescription(
6464
OptionCategory.USER,
65-
"ruby.external_encoding",
65+
"ruby.external-encoding",
6666
"External encoding (configured by the -E Ruby option)",
6767
new String[]{"-E"},
6868
"");
@@ -813,9 +813,9 @@ public static OptionDescription<?> fromName(String name) {
813813
return VERBOSITY;
814814
case "ruby.source_encoding":
815815
return SOURCE_ENCODING;
816-
case "ruby.internal_encoding":
816+
case "ruby.internal-encoding":
817817
return INTERNAL_ENCODING;
818-
case "ruby.external_encoding":
818+
case "ruby.external-encoding":
819819
return EXTERNAL_ENCODING;
820820
case "ruby.home":
821821
return HOME;

tool/options.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ USER:
77
VERBOSITY: [[verbosity, -v, -w, -W, --verbose], enum/verbosity, false, Verbosity]
88

99
SOURCE_ENCODING: [[source_encoding, -K], string, '', Source encoding]
10-
INTERNAL_ENCODING: [[internal_encoding, -E, -U], string, '', Internal encoding]
11-
EXTERNAL_ENCODING: [[external_encoding, -E], string, '', External encoding]
10+
INTERNAL_ENCODING: [[internal-encoding, -E, -U], string, '', Internal encoding]
11+
EXTERNAL_ENCODING: [[external-encoding, -E], string, '', External encoding]
1212

1313
EXPERT:
1414
# Setting home and launcher, useful for embedding

0 commit comments

Comments
 (0)