revert shift return type change to RubyArray from IRubyObject

... was done on 19 methods refactoring - that change is actually not necessary at all
jruby · Apr 1, 2016 · 06ec9c0 · 06ec9c0
1 parent d7d85a1
commit 06ec9c0
Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/core/src/main/java/org/jruby/RubyArray.java b/core/src/main/java/org/jruby/RubyArray.java
@@ -1206,7 +1206,7 @@ public IRubyObject shift(ThreadContext context) {
     }
 
     @JRubyMethod(name = "shift")
-    public RubyArray shift(ThreadContext context, IRubyObject num) {
+    public IRubyObject shift(ThreadContext context, IRubyObject num) {
         modify();
 
         RubyArray result = makeSharedFirst(context, num, false, context.runtime.getArray());

diff --git a/core/src/main/java/org/jruby/util/collections/StringArraySet.java b/core/src/main/java/org/jruby/util/collections/StringArraySet.java
@@ -263,8 +263,8 @@ public synchronized IRubyObject shift(ThreadContext context) {
     }
 
     @Override
-    public synchronized RubyArray shift(ThreadContext context, IRubyObject num) {
-        RubyArray result = super.shift(context, num);
+    public synchronized IRubyObject shift(ThreadContext context, IRubyObject num) {
+        IRubyObject result = super.shift(context, num);
         rehash();
         return result;
     }