rename JRuby.subclasses_of method to simply JRuby.subclasses

jruby · May 23, 2018 · 5f45b43 · 5f45b43
1 parent 003b9ee
commit 5f45b43
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/core/src/main/java/org/jruby/ext/jruby/JRubyLibrary.java b/core/src/main/java/org/jruby/ext/jruby/JRubyLibrary.java
@@ -305,22 +305,22 @@ public static IRubyObject load_string_ext(ThreadContext context, IRubyObject rec
     }
 
     @JRubyMethod(module = true)
-    public static IRubyObject subclasses_of(ThreadContext context, IRubyObject recv, IRubyObject arg) {
-        return subclassesOf(context, recv, arg instanceof RubyClass ? (RubyClass) arg : arg.getMetaClass(), false);
+    public static IRubyObject subclasses(ThreadContext context, IRubyObject recv, IRubyObject arg) {
+        return subclasses(context, recv, arg instanceof RubyClass ? (RubyClass) arg : arg.getMetaClass(), false);
     }
 
     @JRubyMethod(module = true)
-    public static IRubyObject subclasses_of(ThreadContext context, IRubyObject recv, IRubyObject arg, IRubyObject opts) {
+    public static IRubyObject subclasses(ThreadContext context, IRubyObject recv, IRubyObject arg, IRubyObject opts) {
         boolean recurseAll = false;
         opts = ArgsUtil.getOptionsArg(context.runtime, opts);
         if (opts != context.nil) {
             IRubyObject all = ((RubyHash) opts).fastARef(context.runtime.newSymbol("all"));
             if (all != null) recurseAll = all.isTrue();
         }
-        return subclassesOf(context, recv, arg instanceof RubyClass ? (RubyClass) arg : arg.getMetaClass(), recurseAll);
+        return subclasses(context, recv, arg instanceof RubyClass ? (RubyClass) arg : arg.getMetaClass(), recurseAll);
     }
 
-    private static RubyArray subclassesOf(ThreadContext context, final IRubyObject recv,
+    private static RubyArray subclasses(ThreadContext context, final IRubyObject recv,
                                           final RubyClass klass, final boolean recurseAll) {
 
         final RubyArray subclasses = RubyArray.newArray(context.runtime);

diff --git a/lib/ruby/stdlib/jruby/core_ext/class.rb b/lib/ruby/stdlib/jruby/core_ext/class.rb
@@ -29,8 +29,8 @@ class Class
   ##
   # @deprecated since JRuby 9.2, use `JRuby.subclasses_of(klass)`
   def subclasses(recursive = false)
-    warn("klass.subclasses is deprecated, use JRuby.subclasses_of(klass) instead", uplevel: 1)
-    JRuby.subclasses_of(self, all: recursive)
+    warn("klass.subclasses is deprecated, use JRuby.subclasses(klass) instead", uplevel: 1)
+    JRuby.subclasses(self, all: recursive)
   end
 
   ##