Merge pull request jruby#9299 from headius/delete_deprecated

Delete methods deprecated prior to JRuby 9.4.0.0

Author: headius

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

@@ -45,12 +45,6 @@ public RubyModule getOrigin() {
         return origin;
     }
 
-    @Deprecated(since = "9.3.0.0")
-    @Override
-    public RubyModule getNonIncludedClass() {
-        return origin;
-    }
-
     @Deprecated(since = "10.0.3.0")
     @Override
     public IRubyObject id() {

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

@@ -73,24 +73,6 @@ public IncludedModuleWrapper(Ruby runtime, RubyClass superClass, RubyModule orig
         methods = methodsHolder.getMethodsForWrite();
     }
 
-    /**
-     * Overridden newIncludeClass implementation to allow attaching future includes to the correct module
-     * (i.e. the one to which this is attached)
-     *
-     * @see org.jruby.RubyModule#newIncludeClass(RubyClass)
-     */
-    @Override
-    @Deprecated(since = "1.1.5")
-    public IncludedModuleWrapper newIncludeClass(RubyClass superClass) {
-        var context = getCurrentContext();
-        IncludedModuleWrapper includedModule = new IncludedModuleWrapper(context.runtime, superClass, getOrigin());
-
-        // include its parent (and in turn that module's parents)
-        if (getSuperClass() != null) includedModule.includeModule(context, getSuperClass());
-
-        return includedModule;
-    }
-
     public RubyModule getDelegate() {
         return origin;
     }

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

@@ -41,11 +41,6 @@
 
 public final class MetaClass extends RubyClass {
 
-    @Deprecated(since = "9.2.1.0")
-    public MetaClass(Ruby runtime, RubyClass superClass, IRubyObject attached) {
-        this(runtime, superClass, (RubyBasicObject) attached);
-    }
-
     /**
      * rb_class_boot for meta classes ({@link #makeMetaClass(ThreadContext, RubyClass)})
      */

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

@@ -82,11 +82,6 @@ public final IRubyObject cause() {
         return Java.getInstance(getRuntime(), getCause());
     }
 
-    @Deprecated(since = "9.1.0.0")
-    public final IRubyObject cause(Block unusedBlock) {
-        return cause();
-    }
-
     @Override
     public final IRubyObject backtrace() {
         IRubyObject rubyTrace = super.backtrace();
@@ -134,45 +129,6 @@ private static RubyArray joinedBacktrace(final Ruby runtime, final RubyArray rTr
         return RubyArray.newArrayMayCopy(runtime, trace);
     }
 
-    @Deprecated(since = "9.1.0.0") // not used
-    public void trimStackTrace(Member target) {
-        Throwable t = new Throwable();
-        StackTraceElement[] origStackTrace = cause.getStackTrace();
-        StackTraceElement[] currentStackTrace = t.getStackTrace();
-        int skip = 0;
-        for (int i = 1;
-                i <= origStackTrace.length && i <= currentStackTrace.length;
-                ++i) {
-            StackTraceElement a = origStackTrace[origStackTrace.length - i];
-            StackTraceElement b = currentStackTrace[currentStackTrace.length - i];
-            if (a.equals(b)) {
-                skip += 1;
-            } else {
-                break;
-            }
-        }
-        // If we know what method was being called, strip everything
-        // before the call. This hides the JRuby and reflection internals.
-        if (target != null) {
-            String className = target.getDeclaringClass().getName();
-            String methodName = target.getName();
-            for (int i = origStackTrace.length - skip - 1; i >= 0; --i) {
-                StackTraceElement frame = origStackTrace[i];
-                if (frame.getClassName().equals(className) &&
-                    frame.getMethodName().equals(methodName)) {
-                    skip = origStackTrace.length - i - 1;
-                    break;
-                }
-            }
-        }
-        if (skip > 0) {
-            final int len = origStackTrace.length - skip;
-            StackTraceElement[] newStackTrace = new StackTraceElement[len];
-            System.arraycopy(origStackTrace, 0, newStackTrace, 0, len);
-            cause.setStackTrace(newStackTrace);
-        }
-    }
-
     @Override
     public final IRubyObject getMessage() {
         if (message == null) {

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

@@ -137,12 +137,6 @@ public RubyModule getDelegate() {
         return origin;
     }
 
-    @Deprecated(since = "9.3.0.0")
-    @Override
-    public RubyModule getNonIncludedClass() {
-        return origin;
-    }
-
     @Deprecated(since = "10.0.3.0")
     @Override
     public IRubyObject id() {

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

@@ -498,8 +498,6 @@ private Ruby(RubyInstanceConfig config) {
             producerClass = null;
         }
 
-        continuationClass = initContinuation(context);
-
         TracePoint.createTracePointClass(context, objectClass);
 
         warningCategories = config.getWarningCategories();
@@ -1358,19 +1356,6 @@ public RubyClass getClass(String name) {
         return Access.getClass(getCurrentContext(), name);
     }
 
-    /**
-     * Retrieve the class with the given name from the Object namespace. The
-     * module name must be an interned string, but this method will be faster
-     * than the non-interned version.
-     *
-     * @param internedName the name of the class; <em>must</em> be an interned String!
-     * @return
-     */
-    @Deprecated(since = "1.7.0")
-    public RubyClass fastGetClass(String internedName) {
-        return Access.getClass(getCurrentContext(), internedName);
-    }
-
     /**
      * A variation of defineClass that allows passing in an array of supplementary
      * call sites for improving dynamic invocation performance.
@@ -1613,17 +1598,6 @@ private void initThreadStatuses(ThreadContext context) {
         }
     }
 
-    @SuppressWarnings("deprecation")
-    private RubyClass initContinuation(ThreadContext context) {
-        // Bare-bones class for backward compatibility
-        if (profile.allowClass("Continuation")) {
-            // Some third-party code (racc's cparse ext, at least) uses RubyContinuation directly, so we need this.
-            // Most functionality lives in continuation.rb now.
-            return RubyContinuation.createContinuation(context, objectClass);
-        }
-        return null;
-    }
-
     public static final int NIL_PREFILLED_ARRAY_SIZE = RubyArrayNative.ARRAY_DEFAULT_SIZE * 8;
     private final IRubyObject nilPrefilledArray[];
 
@@ -2193,10 +2167,6 @@ void setDefaultThreadGroup(RubyThreadGroup defaultThreadGroup) {
         this.defaultThreadGroup = defaultThreadGroup;
     }
 
-    public RubyClass getContinuation() {
-        return continuationClass;
-    }
-
     public RubyClass getStructClass() {
         return structClass;
     }
@@ -4554,21 +4524,6 @@ public void setAbortOnException(final boolean abortOnException) {
         this.abortOnException = abortOnException;
     }
 
-    @Deprecated(since = "9.3.1.0")
-    public boolean isGlobalAbortOnExceptionEnabled() {
-        return abortOnException;
-    }
-
-    @Deprecated(since = "9.3.1.0")
-    public void setGlobalAbortOnExceptionEnabled(boolean enable) {
-        abortOnException = enable;
-    }
-
-    @Deprecated(since = "9.3.1.0")
-    public IRubyObject getReportOnException() {
-        return reportOnException ? getTrue() : getFalse();
-    }
-
     public boolean isReportOnException() {
         return reportOnException;
     }
@@ -5314,7 +5269,6 @@ public interface RecursiveFunctionEx<T> extends ThreadContext.RecursiveFunctionE
     private final RubyClass ioBufferClass;
     private final RubyClass threadClass;
     private final RubyClass threadGroupClass;
-    private final RubyClass continuationClass;
     private final RubyClass structClass;
     private final RubyClass exceptionClass;
     private final RubyClass dummyClass;
@@ -5768,11 +5722,6 @@ protected TypePopulator computeValue(Class<?> type) {
 
     ParserManager parserManager;
 
-    @Deprecated(since = "9.3.0.0")
-    public RaiseException newErrnoEADDRFromBindException(BindException be) {
-        return newErrnoEADDRFromBindException(be, null);
-    }
-
     @Deprecated(since = "9.4.0.0")
     public RaiseException newFrozenError(String objectType) {
         return newFrozenError(objectType, null);

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

@@ -160,11 +160,6 @@ public ArgsFileData(Ruby runtime, RubyArray argv) {
             this.currentFile = runtime.getNil();
         }
 
-        @Deprecated(since = "9.1.8.0")
-        public void setCurrentLineNumber(Ruby runtime, int linenumber) {
-            runtime.setCurrentLine(linenumber);
-        }
-
         // ARGF.class.new
         void setArgs(RubyArray argv) {
             inited = false;
@@ -239,11 +234,6 @@ public static ArgsFileData getArgsFileData(Ruby runtime) {
             return (ArgsFileData) runtime.getArgsFile().dataGetStruct();
         }
 
-        @Deprecated(since = "9.1.8.0")
-        public static ArgsFileData getDataFrom(IRubyObject recv) {
-            return getArgsFileData(((RubyBasicObject) recv).getCurrentContext().runtime);
-        }
-
         private void createNewFile(File file) {
             try {
                 file.createNewFile();
@@ -302,11 +292,6 @@ public boolean isCurrentFile(RubyIO io) {
         }
     }
 
-    @Deprecated(since = "9.1.8.0")
-    public static void setCurrentLineNumber(IRubyObject recv, int newLineNumber) {
-        ((RubyBasicObject) recv).getCurrentContext().runtime.setCurrentLine(newLineNumber);
-    }
-
     @JRubyMethod
     public static IRubyObject inplace_mode(ThreadContext context, IRubyObject recv) {
         ArgsFileData data = ArgsFileData.getArgsFileData(context.runtime);

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

@@ -419,11 +419,6 @@ public static RubyArray aryToAry(ThreadContext context, IRubyObject obj) {
         return tmp != context.nil ? (RubyArray) tmp : RubyArray.newArray(context.runtime, obj);
     }
 
-    @Deprecated(since = "9.2.5.0")
-    public static RubyArray aryToAry(IRubyObject obj) {
-        return aryToAry(obj.getRuntime().getCurrentContext(), obj);
-    }
-
     @Deprecated(since = "10.0.0.0")
     public IRubyObject insert(IRubyObject arg) {
         return insert(getCurrentContext(), arg);
@@ -493,7 +488,7 @@ public RubyArray<?> append(IRubyObject item) {
     @JRubyMethod(name = "<<")
     public abstract RubyArray append(ThreadContext context, IRubyObject item);
 
-    @Deprecated // not-used
+    @Deprecated(since = "10.0.3.0") // not-used
     public RubyArray<?> push_m(IRubyObject[] items) {
         return push(items);
     }
@@ -572,11 +567,6 @@ public IRubyObject aref(IRubyObject[] args) {
         };
     }
 
-    @Deprecated(since = "9.4.0.0")
-    public IRubyObject aref(IRubyObject arg0) {
-        return aref(getCurrentContext(), arg0);
-    }
-
     @JRubyMethod(name = {"[]", "slice"})
     public abstract IRubyObject aref(ThreadContext context, IRubyObject arg0);
 
@@ -757,11 +747,6 @@ public IRubyObject to_ary() {
         return this;
     }
 
-    @Deprecated(since = "9.3.0.0")
-    public IRubyObject to_h(ThreadContext context) {
-        return to_h(context, Block.NULL_BLOCK);
-    }
-
     @JRubyMethod(name = "to_ary")
     public final IRubyObject to_ary(ThreadContext context) {
     	return this;
@@ -1431,59 +1416,6 @@ private static JavaSites.ArraySites sites(ThreadContext context) {
         return context.sites.Array;
     }
 
-    /**
-     * Increases the capacity of this <code>Array</code>, if necessary.
-     * @param minCapacity the desired minimum capacity of the internal array
-     */
-    @Deprecated(since = "9.1.3.0")
-    public void ensureCapacity(int minCapacity) {
-        throw getRuntime().newNotImplementedError("RubyArray#ensure_capacity has been removed");
-    }
-
-    @Deprecated(since = "9.2.10.0")
-    @Override
-    public RubyArray to_a() {
-        throw getRuntime().newNotImplementedError("RubyArray#to_a has been removed");
-    }
-
-    @Deprecated(since = "9.2.15.0")
-    public IRubyObject shuffle(ThreadContext context, IRubyObject[] args) {
-        switch (args.length) {
-            case 0:
-                return shuffle(context);
-            case 1:
-                return shuffle(context, args[0]);
-            default:
-                throw argumentError(context, args.length, 0, 0);
-        }
-    }
-
-    @Deprecated(since = "9.2.15.0")
-    public IRubyObject shuffle_bang(ThreadContext context, IRubyObject[] args) {
-        switch (args.length) {
-            case 0:
-                return shuffle_bang(context, context.nil);
-            case 1:
-                return shuffle_bang(context, args[0]);
-            default:
-                throw argumentError(context, args.length, 0, 0);
-        }
-    }
-
-    @Deprecated(since = "9.2.15.0")
-    public IRubyObject sample(ThreadContext context, IRubyObject[] args) {
-        switch (args.length) {
-            case 0:
-                return sample(context);
-            case 1:
-                return sample(context, args[0]);
-            case 2:
-                return sample(context, args[0], args[1]);
-            default:
-                throw argumentError(context, args.length, 0, 1);
-        }
-    }
-
     /**
      * Returns a stream of each IRubyObject
      * @return