Skip to content

Commit ff7780d

Browse files
headiusheadius
authored
Merge pull request #8143 from headius/remove_versioned_methods
Remove versioned methods
2 parents 6ea114b + 2674790 commit ff7780d

File tree

76 files changed

+436
-2273
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+436
-2273
lines changed

‎core/pom.rb‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,6 @@
194194
'org/jruby/anno/AnnotationBinder.java',
195195
'org/jruby/anno/JRubyMethod.java',
196196
'org/jruby/anno/FrameField.java',
197-
'org/jruby/CompatVersion.java',
198197
'org/jruby/runtime/Visibility.java',
199198
'org/jruby/util/CodegenUtils.java',
200199
'org/jruby/util/SafePropertyAccessor.java' ] )

‎core/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,6 @@ DO NOT MODIFY - GENERATED CODE
429429
<include>org/jruby/anno/AnnotationBinder.java</include>
430430
<include>org/jruby/anno/JRubyMethod.java</include>
431431
<include>org/jruby/anno/FrameField.java</include>
432-
<include>org/jruby/CompatVersion.java</include>
433432
<include>org/jruby/runtime/Visibility.java</include>
434433
<include>org/jruby/util/CodegenUtils.java</include>
435434
<include>org/jruby/util/SafePropertyAccessor.java</include>

‎core/src/main/java/org/jruby/AbstractRubyMethod.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,6 @@ public RubyFixnum arity() {
7777
return getRuntime().newFixnum(method.getSignature().arityValue());
7878
}
7979

80-
@Deprecated
81-
public final IRubyObject op_eql19(ThreadContext context, IRubyObject other) {
82-
return op_eql(context, other);
83-
}
84-
8580
@JRubyMethod(name = "eql?")
8681
public IRubyObject op_eql(ThreadContext context, IRubyObject other) {
8782
return RubyBoolean.newBoolean(context, equals(other) );

‎core/src/main/java/org/jruby/CompatVersion.java‎

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎core/src/main/java/org/jruby/RubyArgsFile.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -587,21 +587,11 @@ public static IRubyObject lines(ThreadContext context, IRubyObject recv, IRubyOb
587587
return each_line(context, recv, args, block);
588588
}
589589

590-
@Deprecated
591-
public static IRubyObject each_line19(final ThreadContext context, IRubyObject recv, IRubyObject[] args, final Block block) {
592-
return each_line(context, recv, args, block);
593-
}
594-
595590
@JRubyMethod(name = "each", optional = 1, checkArity = false)
596591
public static IRubyObject each(final ThreadContext context, IRubyObject recv, IRubyObject[] args, final Block block) {
597592
return block.isGiven() ? each_line(context, recv, args, block) : enumeratorize(context.runtime, recv, "each", args);
598593
}
599594

600-
@Deprecated
601-
public static IRubyObject each19(final ThreadContext context, IRubyObject recv, IRubyObject[] args, final Block block) {
602-
return each(context, recv, args, block);
603-
}
604-
605595
@JRubyMethod(name = "file")
606596
public static IRubyObject file(ThreadContext context, IRubyObject recv) {
607597
ArgsFileData data = ArgsFileData.getArgsFileData(context.runtime);

0 commit comments

Comments
 (0)