Skip to content

Commit 4553e9c

Browse files
committed
Remove remaining "19" methods
These methods were not deprecated before JRuby 10, so they were left in place for one additional "major" release. This deletes them. They are very low risk of causing compile or execution problems, but this safer approach gives any remaining users a full version cycle to switch to the long-available normal versions. See #8143 for the original pass that removed already- deprecated methods.
1 parent acf945c commit 4553e9c

File tree

15 files changed

+1
-238
lines changed

15 files changed

+1
-238
lines changed

core/src/main/java/org/jruby/RubyArray.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2078,11 +2078,6 @@ private void recursiveJoin(final ThreadContext context, final IRubyObject outVal
20782078
context.safeRecurse(JOIN_RECURSIVE, new JoinRecursive.State(ary, outValue, sep, result, first), outValue, "join", true);
20792079
}
20802080

2081-
@Deprecated
2082-
public IRubyObject join19(final ThreadContext context, IRubyObject sep) {
2083-
return join(context, sep);
2084-
}
2085-
20862081
/** rb_ary_join
20872082
*
20882083
*/
@@ -2124,11 +2119,6 @@ public IRubyObject join(final ThreadContext context, IRubyObject sep) {
21242119
return result;
21252120
}
21262121

2127-
@Deprecated
2128-
public IRubyObject join19(ThreadContext context) {
2129-
return join(context);
2130-
}
2131-
21322122
@JRubyMethod(name = "join")
21332123
public IRubyObject join(ThreadContext context) {
21342124
return join(context, getDefaultSeparator(context.runtime));

core/src/main/java/org/jruby/RubyDir.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -486,11 +486,6 @@ public static RubyArray children(ThreadContext context, IRubyObject recv, IRubyO
486486
return dir.children(context);
487487
}
488488

489-
@Deprecated
490-
public static IRubyObject rmdir19(IRubyObject recv, IRubyObject path) {
491-
return rmdir(recv.getRuntime().getCurrentContext(), recv, path);
492-
}
493-
494489
/**
495490
* Deletes the directory specified by <code>path</code>. The directory must be empty.
496491
*/

core/src/main/java/org/jruby/RubyFile.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1268,11 +1268,6 @@ public static IRubyObject readlink(ThreadContext context, IRubyObject recv, IRub
12681268
}
12691269
}
12701270

1271-
@Deprecated
1272-
public static IRubyObject truncate19(ThreadContext context, IRubyObject recv, IRubyObject arg1, IRubyObject arg2) {
1273-
return truncate(context, recv, arg1, arg2);
1274-
}
1275-
12761271
// Can we produce IOError which bypasses a close?
12771272
@JRubyMethod(name = "truncate", meta = true)
12781273
public static IRubyObject truncate(ThreadContext context, IRubyObject recv, IRubyObject arg1, IRubyObject arg2) {

core/src/main/java/org/jruby/RubyFileStat.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,6 @@ private void setup(String filename, boolean lstat) {
142142
}
143143
}
144144

145-
@Deprecated
146-
public IRubyObject initialize19(IRubyObject fname, Block unusedBlock) {
147-
return initialize(fname, unusedBlock);
148-
}
149-
150145
@JRubyMethod(name = "initialize", visibility = Visibility.PRIVATE)
151146
public IRubyObject initialize(IRubyObject fname, Block unusedBlock) {
152147
Ruby runtime = getRuntime();

core/src/main/java/org/jruby/RubyMatchData.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -673,11 +673,6 @@ public IRubyObject end(ThreadContext context, IRubyObject index) {
673673
return RubyFixnum.newFixnum(runtime, e);
674674
}
675675

676-
@Deprecated
677-
public IRubyObject offset19(ThreadContext context, IRubyObject index) {
678-
return offset(context, index);
679-
}
680-
681676
/** match_offset
682677
*
683678
*/

core/src/main/java/org/jruby/RubyMath.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -370,11 +370,6 @@ public static RubyFloat cbrt(ThreadContext context, IRubyObject recv, IRubyObjec
370370
return RubyFloat.newFloat(context.runtime, result);
371371
}
372372

373-
@Deprecated
374-
public static RubyFloat hypot19(ThreadContext context, IRubyObject recv, IRubyObject x, IRubyObject y) {
375-
return hypot(context, recv, x, y);
376-
}
377-
378373
@JRubyMethod(name = "hypot", module = true, visibility = Visibility.PRIVATE)
379374
public static RubyFloat hypot(ThreadContext context, IRubyObject recv, IRubyObject x, IRubyObject y) {
380375
double valuea = RubyNumeric.num2dbl(context, x);

core/src/main/java/org/jruby/RubyModule.java

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3200,23 +3200,13 @@ protected void addMethodSymbols(Ruby runtime, Set<String> seen, RubyArray ary, b
32003200
});
32013201
}
32023202

3203-
@Deprecated
3204-
public RubyArray instance_methods19(IRubyObject[] args) {
3205-
return instance_methods(args);
3206-
}
3207-
32083203
@JRubyMethod(name = "instance_methods", optional = 1, checkArity = false)
32093204
public RubyArray instance_methods(IRubyObject[] args) {
32103205
Arity.checkArgumentCount(getRuntime(), args, 0, 1);
32113206

32123207
return instanceMethods(args, PRIVATE, false, true);
32133208
}
32143209

3215-
@Deprecated
3216-
public RubyArray public_instance_methods19(IRubyObject[] args) {
3217-
return public_instance_methods(args);
3218-
}
3219-
32203210
@JRubyMethod(name = "public_instance_methods", optional = 1, checkArity = false)
32213211
public RubyArray public_instance_methods(IRubyObject[] args) {
32223212
Arity.checkArgumentCount(getRuntime(), args, 0, 1);
@@ -4014,11 +4004,6 @@ public IRubyObject class_variable_defined_p(ThreadContext context, IRubyObject v
40144004
return context.fals;
40154005
}
40164006

4017-
@Deprecated
4018-
public IRubyObject class_variable_get19(IRubyObject name) {
4019-
return class_variable_get(name);
4020-
}
4021-
40224007
/** rb_mod_cvar_get
40234008
*
40244009
*/
@@ -4035,11 +4020,6 @@ public IRubyObject class_variable_set(IRubyObject name, IRubyObject value) {
40354020
return setClassVar(validateClassVariable(getRuntime(), name), value);
40364021
}
40374022

4038-
@Deprecated
4039-
public IRubyObject class_variable_set19(IRubyObject name, IRubyObject value) {
4040-
return class_variable_set(name, value);
4041-
}
4042-
40434023
/** rb_mod_remove_cvar
40444024
*
40454025
*/
@@ -4048,11 +4028,6 @@ public IRubyObject remove_class_variable(ThreadContext context, IRubyObject name
40484028
return removeClassVariable(validateClassVariable(context.runtime, name));
40494029
}
40504030

4051-
@Deprecated
4052-
public IRubyObject remove_class_variable19(ThreadContext context, IRubyObject name) {
4053-
return remove_class_variable(context, name);
4054-
}
4055-
40564031
@JRubyMethod(name = "class_variables")
40574032
public RubyArray class_variables(ThreadContext context) {
40584033
Ruby runtime = context.runtime;

core/src/main/java/org/jruby/RubyProcess.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1819,11 +1819,6 @@ public static IRubyObject _fork(ThreadContext context, IRubyObject recv, Block b
18191819
throw context.runtime.newNotImplementedError("fork is not available on this platform");
18201820
}
18211821

1822-
@Deprecated
1823-
public static IRubyObject fork19(ThreadContext context, IRubyObject recv, Block block) {
1824-
return fork(context, recv, block);
1825-
}
1826-
18271822
@JRubyMethod(name = "fork", module = true, visibility = PRIVATE, notImplemented = true)
18281823
public static IRubyObject fork(ThreadContext context, IRubyObject recv, Block block) {
18291824
return RubyKernel.fork(context, recv, block);

0 commit comments

Comments
 (0)