Skip to content

Commit

Permalink
Remove deprecated 18/19/20 methods
Browse files Browse the repository at this point in the history
This removes methods with the "18", "19", or "20" suffix
indicating that they are associated with those versions of Ruby.
Where there existed such methods that were not previously
deprecated, new deprecation was added but the methods were not
removed. Any remaining callers of these methods were modified to
call the non-suffixed version.
  • Loading branch information
headius committed Mar 12, 2024
1 parent 6ea114b commit 1491799
Show file tree
Hide file tree
Showing 65 changed files with 435 additions and 2,143 deletions.
5 changes: 0 additions & 5 deletions core/src/main/java/org/jruby/AbstractRubyMethod.java
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,6 @@ public RubyFixnum arity() {
return getRuntime().newFixnum(method.getSignature().arityValue());
}

@Deprecated
public final IRubyObject op_eql19(ThreadContext context, IRubyObject other) {
return op_eql(context, other);
}

@JRubyMethod(name = "eql?")
public IRubyObject op_eql(ThreadContext context, IRubyObject other) {
return RubyBoolean.newBoolean(context, equals(other) );
Expand Down
10 changes: 0 additions & 10 deletions core/src/main/java/org/jruby/RubyArgsFile.java
Original file line number Diff line number Diff line change
Expand Up @@ -587,21 +587,11 @@ public static IRubyObject lines(ThreadContext context, IRubyObject recv, IRubyOb
return each_line(context, recv, args, block);
}

@Deprecated
public static IRubyObject each_line19(final ThreadContext context, IRubyObject recv, IRubyObject[] args, final Block block) {
return each_line(context, recv, args, block);
}

@JRubyMethod(name = "each", optional = 1, checkArity = false)
public static IRubyObject each(final ThreadContext context, IRubyObject recv, IRubyObject[] args, final Block block) {
return block.isGiven() ? each_line(context, recv, args, block) : enumeratorize(context.runtime, recv, "each", args);
}

@Deprecated
public static IRubyObject each19(final ThreadContext context, IRubyObject recv, IRubyObject[] args, final Block block) {
return each(context, recv, args, block);
}

@JRubyMethod(name = "file")
public static IRubyObject file(ThreadContext context, IRubyObject recv) {
ArgsFileData data = ArgsFileData.getArgsFileData(context.runtime);
Expand Down
Loading

0 comments on commit 1491799

Please sign in to comment.