Remove some defunct code references to Rubinius.

jruby · Jan 29, 2018 · dd9e5e7 · dd9e5e7
1 parent 6df757c
commit dd9e5e7
Showing 2 changed files with 0 additions and 7 deletions.
diff --git a/core/src/main/java/org/jruby/runtime/backtrace/TraceType.java b/core/src/main/java/org/jruby/runtime/backtrace/TraceType.java
@@ -157,8 +157,6 @@ public static TraceType traceTypeFor(String style) {
         if (style.equalsIgnoreCase("raw")) return new TraceType(Gather.RAW, Format.JRUBY);
         else if (style.equalsIgnoreCase("ruby_framed")) return new TraceType(Gather.NORMAL, Format.JRUBY);
         else if (style.equalsIgnoreCase("normal")) return new TraceType(Gather.NORMAL, Format.JRUBY);
-            // deprecated, just uses jruby format now
-        else if (style.equalsIgnoreCase("rubinius")) return new TraceType(Gather.NORMAL, Format.JRUBY);
         else if (style.equalsIgnoreCase("full")) return new TraceType(Gather.FULL, Format.JRUBY);
         else if (style.equalsIgnoreCase("mri")) return new TraceType(Gather.NORMAL, Format.MRI);
         else return new TraceType(Gather.NORMAL, Format.JRUBY);

diff --git a/lib/ruby/stdlib/jruby/vm.rb b/lib/ruby/stdlib/jruby/vm.rb
@@ -189,9 +189,4 @@ def initialize()
   CURRENT = MainVM.new
   MAP ||= HashMap.new
   MAP[VM_ID] = CURRENT
-end
-
-module Rubinius
-  VM = JRuby::VM
-  VM_ID = JRuby::VM_ID
 end