Remove Truffle::Interop#{import_without_conversion,export_without_conversion}

* There is no more valid usage of those.

Author: eregon

doc/contributor/interop.md

@@ -128,7 +128,7 @@ conversion for `EXECUTE` using `Truffle::Interop.execute_without_conversion`,
 for `READ` using `Truffle::Interop.read_without_conversion`, and for `UNBOX`
 using `Truffle::Interop.unbox_without_conversion`.
 
-Import also converts `byte/short/float`, and has a `import_without_conversion` counterpart.
+`Polyglot.import` also converts `byte/short/float`.
 
 ## Import and export
 

spec/truffle/interop/export_spec.rb

@@ -53,23 +53,7 @@
     it "does not convert to Java when exporting a Ruby string" do
       ruby_string = 'hello'
       Truffle::Interop.export :exports_a_string_with_conversion, ruby_string
-      imported = Truffle::Interop.import_without_conversion(:exports_a_string_with_conversion)
-      Truffle::Interop.should_not.java_string?(imported)
-      imported.should.equal?(ruby_string)
-    end
-
-    it "can export a string without conversion to Java" do
-      ruby_string = 'hello'
-      Truffle::Interop.export_without_conversion :exports_a_string_without_conversion, ruby_string
-      imported = Truffle::Interop.import_without_conversion(:exports_a_string_without_conversion)
-      Truffle::Interop.should_not.java_string?(imported)
-      imported.should.equal?(ruby_string)
-    end
-
-    it "can import a string without conversion from Java" do
-      ruby_string = 'hello'
-      Truffle::Interop.export :imports_a_string_without_conversion, ruby_string
-      imported = Truffle::Interop.import_without_conversion(:imports_a_string_without_conversion)
+      imported = Truffle::Interop.import(:exports_a_string_with_conversion)
       Truffle::Interop.should_not.java_string?(imported)
       imported.should.equal?(ruby_string)
     end

src/main/java/org/truffleruby/interop/InteropNodes.java

@@ -188,16 +188,6 @@ protected Object proxyForeignObject(Object delegate, Object logger) {
             return new ProxyForeignObject(delegate, logger);
         }
     }
-
-    @Primitive(name = "foreign_to_ruby")
-    public abstract static class ForeignToRubyPrimitive extends PrimitiveArrayArgumentsNode {
-
-        @Specialization
-        protected Object foreignToRuby(Object value,
-                @Cached ForeignToRubyNode foreignToRubyNode) {
-            return foreignToRubyNode.executeConvert(value);
-        }
-    }
     // endregion
 
     // region eval
@@ -1518,9 +1508,9 @@ protected Object export(String name, Object object) {
         }
     }
 
-    @CoreMethod(names = "import_without_conversion", onSingleton = true, required = 1)
+    @CoreMethod(names = "import", onSingleton = true, required = 1)
     @NodeChild(value = "name", type = RubyNode.class)
-    public abstract static class ImportWithoutConversionNode extends CoreMethodNode {
+    public abstract static class ImportNode extends CoreMethodNode {
 
         @CreateCast("name")
         protected RubyNode coerceNameToString(RubyNode name) {
@@ -1529,10 +1519,11 @@ protected RubyNode coerceNameToString(RubyNode name) {
 
         @Specialization
         protected Object importObject(String name,
-                @Cached BranchProfile errorProfile) {
+                @Cached BranchProfile errorProfile,
+                @Cached ForeignToRubyNode foreignToRubyNode) {
             final Object value = doImport(name);
             if (value != null) {
-                return value;
+                return foreignToRubyNode.executeConvert(value);
             } else {
                 errorProfile.enter();
                 throw new RaiseException(getContext(), coreExceptions().nameErrorImportNotFound(name, this));

src/main/ruby/truffleruby/core/truffle/interop.rb

@@ -88,15 +88,6 @@ def self.export_method(name)
       export(name.to_s, Object.method(name.to_sym))
     end
 
-    # For compatibility TODO keep or not?
-    def self.export_without_conversion(name, value)
-      export name, value
-    end
-
-    def self.import(name)
-      Primitive.foreign_to_ruby(import_without_conversion(name))
-    end
-
     def self.get_members_implementation(object, internal)
       keys = []