[Truffle] Don't special-case requiring 'time'.

jruby · Feb 17, 2015 · a64434d · a64434d
1 parent 845da02
commit a64434d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/lib/ruby/truffle/shims/time.rb b/lib/ruby/truffle/shims/time.rb
@@ -0,0 +1,9 @@
+# Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. This
+# code is released under a tri EPL/GPL/LGPL license. You can use it,
+# redistribute it and/or modify it under the terms of the:
+#
+# Eclipse Public License version 1.0
+# GNU General Public License version 2
+# GNU Lesser General Public License version 2.1
+
+# Empty time file - everything is loaded by default at the moment
diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/subsystems/FeatureManager.java b/truffle/src/main/java/org/jruby/truffle/runtime/subsystems/FeatureManager.java
@@ -58,10 +58,6 @@ public boolean require(String path, String feature, RubyNode currentNode) throws
                     return true;
                 }
 
-                if (feature.equals("time")) {
-                    return true;
-                }
-
                 // Try as a full path
 
                 if (requireFile(feature, currentNode)) {