[Truffle] Organise imports.

Author: chrisseaton

truffle/src/main/java/org/jruby/truffle/JRubyTruffleImpl.java

@@ -9,14 +9,8 @@
  */
 package org.jruby.truffle;
 
-import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.source.Source;
-import com.oracle.truffle.api.vm.PolyglotEngine;
 import org.jruby.JRubyTruffleInterface;
 import org.jruby.RubyInstanceConfig;
-import org.jruby.truffle.interop.InstanceConfigWrapper;
-import org.jruby.truffle.platform.graal.Graal;
-import org.jruby.util.cli.Options;
 
 import java.io.InputStream;
 

truffle/src/main/java/org/jruby/truffle/Main.java

@@ -49,9 +49,6 @@
 import org.jruby.util.cli.Options;
 import org.jruby.util.cli.OutputStrings;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.InputStream;
 import java.lang.management.ManagementFactory;
 

truffle/src/main/java/org/jruby/truffle/core/TruffleSystemNodes.java

@@ -13,9 +13,6 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.object.DynamicObject;
-
-import java.util.Set;
-
 import org.jcodings.Encoding;
 import org.jcodings.specific.UTF8Encoding;
 import org.jruby.ext.rbconfig.RbConfigLibrary;
@@ -26,6 +23,8 @@
 import org.jruby.truffle.core.string.StringOperations;
 import org.jruby.util.unsafe.UnsafeHolder;
 
+import java.util.Set;
+
 @CoreClass("Truffle::System")
 public abstract class TruffleSystemNodes {
 

truffle/src/main/java/org/jruby/truffle/core/hash/CompareHashKeysNode.java

@@ -9,15 +9,14 @@
  */
 package org.jruby.truffle.core.hash;
 
+import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.frame.VirtualFrame;
 import org.jruby.truffle.core.basicobject.BasicObjectNodes.ReferenceEqualNode;
 import org.jruby.truffle.core.basicobject.BasicObjectNodesFactory.ReferenceEqualNodeFactory;
 import org.jruby.truffle.core.kernel.KernelNodes.SameOrEqlNode;
 import org.jruby.truffle.core.kernel.KernelNodesFactory.SameOrEqlNodeFactory;
 import org.jruby.truffle.language.RubyBaseNode;
 
-import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.frame.VirtualFrame;
-
 public class CompareHashKeysNode extends RubyBaseNode {
 
     @Child private SameOrEqlNode sameOrEqlNode;

truffle/src/main/java/org/jruby/truffle/core/hash/FreezeHashKeyIfNeededNode.java

@@ -9,18 +9,17 @@
  */
 package org.jruby.truffle.core.hash;
 
-import org.jruby.truffle.language.RubyNode;
-import org.jruby.truffle.language.dispatch.CallDispatchHeadNode;
-import org.jruby.truffle.language.dispatch.DispatchHeadNodeFactory;
-import org.jruby.truffle.language.objects.IsFrozenNode;
-import org.jruby.truffle.language.objects.IsFrozenNodeGen;
-
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.NodeChildren;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.object.DynamicObject;
+import org.jruby.truffle.language.RubyNode;
+import org.jruby.truffle.language.dispatch.CallDispatchHeadNode;
+import org.jruby.truffle.language.dispatch.DispatchHeadNodeFactory;
+import org.jruby.truffle.language.objects.IsFrozenNode;
+import org.jruby.truffle.language.objects.IsFrozenNodeGen;
 
 @NodeChildren({@NodeChild("key"), @NodeChild("compareByIdentity")})
 public abstract class FreezeHashKeyIfNeededNode extends RubyNode {

truffle/src/main/java/org/jruby/truffle/core/hash/HashNode.java

@@ -12,7 +12,6 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.profiles.ConditionProfile;
-
 import org.jruby.truffle.core.ObjectNodes.ObjectIDPrimitiveNode;
 import org.jruby.truffle.core.ObjectNodesFactory.ObjectIDPrimitiveNodeFactory;
 import org.jruby.truffle.language.RubyBaseNode;

truffle/src/main/java/org/jruby/truffle/core/hash/LookupEntryNode.java

@@ -9,12 +9,11 @@
  */
 package org.jruby.truffle.core.hash;
 
-import org.jruby.truffle.Layouts;
-import org.jruby.truffle.language.RubyBaseNode;
-
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.profiles.ConditionProfile;
+import org.jruby.truffle.Layouts;
+import org.jruby.truffle.language.RubyBaseNode;
 
 public class LookupEntryNode extends RubyBaseNode {
 

truffle/src/main/java/org/jruby/truffle/core/hash/SetNode.java

@@ -9,9 +9,6 @@
  */
 package org.jruby.truffle.core.hash;
 
-import org.jruby.truffle.Layouts;
-import org.jruby.truffle.language.RubyNode;
-
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.ImportStatic;
@@ -23,6 +20,8 @@
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.ConditionProfile;
+import org.jruby.truffle.Layouts;
+import org.jruby.truffle.language.RubyNode;
 
 @ImportStatic(HashGuards.class)
 @NodeChildren({

truffle/src/main/java/org/jruby/truffle/core/kernel/KernelNodes.java

@@ -68,7 +68,6 @@
 import org.jruby.truffle.core.cast.ToPathNodeGen;
 import org.jruby.truffle.core.cast.ToStrNode;
 import org.jruby.truffle.core.cast.ToStrNodeGen;
-import org.jruby.truffle.core.encoding.EncodingOperations;
 import org.jruby.truffle.core.format.BytesResult;
 import org.jruby.truffle.core.format.FormatExceptionTranslator;
 import org.jruby.truffle.core.format.exceptions.FormatException;

truffle/src/main/java/org/jruby/truffle/core/rope/AsciiOnlyLeafRope.java

@@ -10,7 +10,6 @@
 
 package org.jruby.truffle.core.rope;
 
-import com.oracle.truffle.api.CompilerDirectives;
 import org.jcodings.Encoding;
 
 public class AsciiOnlyLeafRope extends LeafRope {

truffle/src/main/java/org/jruby/truffle/core/rope/ConcatRope.java

@@ -9,7 +9,6 @@
  */
 package org.jruby.truffle.core.rope;
 
-import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import org.jcodings.Encoding;
 

truffle/src/main/java/org/jruby/truffle/core/rope/InvalidLeafRope.java

@@ -10,7 +10,6 @@
 
 package org.jruby.truffle.core.rope;
 
-import com.oracle.truffle.api.CompilerDirectives;
 import org.jcodings.Encoding;
 
 public class InvalidLeafRope extends LeafRope {

truffle/src/main/java/org/jruby/truffle/core/rope/LazyIntRope.java

@@ -9,7 +9,6 @@
  */
 package org.jruby.truffle.core.rope;
 
-import com.oracle.truffle.api.CompilerDirectives;
 import org.jcodings.Encoding;
 import org.jcodings.specific.USASCIIEncoding;
 

truffle/src/main/java/org/jruby/truffle/core/rope/RopeOperations.java

@@ -21,7 +21,6 @@
  */
 package org.jruby.truffle.core.rope;
 
-import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.object.DynamicObject;
 import org.jcodings.Encoding;
@@ -33,7 +32,6 @@
 import org.jruby.truffle.core.encoding.EncodingManager;
 import org.jruby.truffle.core.string.StringOperations;
 import org.jruby.truffle.language.RubyGuards;
-import org.jruby.truffle.language.control.RaiseException;
 import org.jruby.truffle.util.StringUtils;
 import org.jruby.util.ByteList;
 import org.jruby.util.Memo;

truffle/src/main/java/org/jruby/truffle/core/rope/SubstringRope.java

@@ -10,7 +10,6 @@
 
 package org.jruby.truffle.core.rope;
 
-import com.oracle.truffle.api.CompilerDirectives;
 import org.jcodings.Encoding;
 
 public class SubstringRope extends Rope {

truffle/src/main/java/org/jruby/truffle/core/rope/ValidLeafRope.java

@@ -10,7 +10,6 @@
 
 package org.jruby.truffle.core.rope;
 
-import com.oracle.truffle.api.CompilerDirectives;
 import org.jcodings.Encoding;
 
 public class ValidLeafRope extends LeafRope {

truffle/src/main/java/org/jruby/truffle/core/string/StringOperations.java

@@ -33,7 +33,6 @@
  */
 package org.jruby.truffle.core.string;
 
-import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.object.DynamicObject;
 import org.jcodings.Encoding;
@@ -46,7 +45,6 @@
 import org.jruby.truffle.core.rope.RopeOperations;
 import org.jruby.truffle.language.RubyGuards;
 import org.jruby.truffle.util.ByteListUtils;
-import org.jruby.truffle.util.StringUtils;
 import org.jruby.util.ByteList;
 
 import java.nio.ByteBuffer;

truffle/src/main/java/org/jruby/truffle/core/thread/ThreadNodes.java

@@ -50,7 +50,6 @@
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.source.SourceSection;
-
 import org.jcodings.specific.USASCIIEncoding;
 import org.jruby.runtime.Visibility;
 import org.jruby.truffle.Layouts;

truffle/src/main/java/org/jruby/truffle/core/time/RubyDateFormatter.java

@@ -42,8 +42,8 @@
 import jnr.constants.platform.Errno;
 import org.jcodings.Encoding;
 import org.jcodings.specific.ASCIIEncoding;
-import org.joda.time.DateTime;
 import org.joda.time.Chronology;
+import org.joda.time.DateTime;
 import org.joda.time.chrono.GJChronology;
 import org.joda.time.chrono.JulianChronology;
 import org.jruby.truffle.RubyContext;

truffle/src/main/java/org/jruby/truffle/extra/TrufflePosixNodes.java

@@ -20,7 +20,6 @@
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.source.SourceSection;
 import com.sun.security.auth.module.UnixSystem;
-
 import jnr.constants.platform.Fcntl;
 import jnr.ffi.Pointer;
 import org.jcodings.specific.UTF8Encoding;
@@ -36,7 +35,6 @@
 import org.jruby.truffle.extra.ffi.PointerPrimitiveNodes;
 import org.jruby.truffle.language.SnippetNode;
 import org.jruby.truffle.language.control.RaiseException;
-import org.jruby.truffle.language.objects.AllocateObjectNode;
 import org.jruby.truffle.platform.UnsafeGroup;
 import org.jruby.truffle.platform.signal.Signal;
 

truffle/src/main/java/org/jruby/truffle/interop/InstanceConfigWrapper.java

@@ -11,7 +11,6 @@
 
 import com.oracle.truffle.api.interop.ForeignAccess;
 import com.oracle.truffle.api.interop.TruffleObject;
-import org.jruby.Ruby;
 import org.jruby.RubyInstanceConfig;
 
 public class InstanceConfigWrapper implements TruffleObject {

truffle/src/main/java/org/jruby/truffle/language/globals/AliasGlobalVarNode.java

@@ -10,9 +10,8 @@
 
 package org.jruby.truffle.language.globals;
 
-import org.jruby.truffle.language.RubyNode;
-
 import com.oracle.truffle.api.frame.VirtualFrame;
+import org.jruby.truffle.language.RubyNode;
 
 public class AliasGlobalVarNode extends RubyNode {
 

truffle/src/main/java/org/jruby/truffle/platform/openjdk/OpenJDKArrayBlockingQueueLocksConditions.java

@@ -9,12 +9,11 @@
  */
 package org.jruby.truffle.platform.openjdk;
 
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import org.jruby.truffle.core.queue.ArrayBlockingQueueLocksConditions;
 import org.jruby.truffle.core.queue.DelegatingBlockingQueue;
 import org.jruby.truffle.language.control.JavaException;
 
-import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-
 import java.lang.invoke.MethodHandle;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.locks.Condition;

truffle/src/main/java/org/jruby/truffle/platform/posix/JNRTrufflePosix.java

@@ -9,6 +9,8 @@
  */
 package org.jruby.truffle.platform.posix;
 
+import com.kenai.jffi.Platform;
+import com.kenai.jffi.Platform.OS;
 import jnr.constants.platform.Fcntl;
 import jnr.constants.platform.Signal;
 import jnr.constants.platform.Sysconf;
@@ -21,9 +23,6 @@
 import jnr.posix.Times;
 import org.jruby.truffle.core.CoreLibrary;
 
-import com.kenai.jffi.Platform;
-import com.kenai.jffi.Platform.OS;
-
 import java.io.FileDescriptor;
 import java.nio.ByteBuffer;
 import java.util.Collection;

truffle/src/main/java/org/jruby/truffle/platform/posix/PosixFDSet4Bytes.java

@@ -11,7 +11,6 @@
 package org.jruby.truffle.platform.posix;
 
 import jnr.ffi.Pointer;
-
 import org.jruby.truffle.platform.FDSet;
 import org.jruby.truffle.util.StringUtils;
 

truffle/src/main/java/org/jruby/truffle/platform/posix/PosixFDSet8Bytes.java

@@ -11,7 +11,6 @@
 package org.jruby.truffle.platform.posix;
 
 import jnr.ffi.Pointer;
-
 import org.jruby.truffle.platform.FDSet;
 import org.jruby.truffle.util.StringUtils;
 

truffle/src/main/java/org/jruby/truffle/platform/solaris/SolarisPlatform.java

@@ -9,6 +9,11 @@
  */
 package org.jruby.truffle.platform.solaris;
 
+import jnr.ffi.LibraryLoader;
+import jnr.ffi.Runtime;
+import jnr.ffi.provider.MemoryManager;
+import jnr.posix.POSIX;
+import jnr.posix.POSIXFactory;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.queue.ArrayBlockingQueueLocksConditions;
 import org.jruby.truffle.core.queue.LinkedBlockingQueueLocksConditions;
@@ -29,12 +34,6 @@
 import org.jruby.truffle.platform.signal.SignalManager;
 import org.jruby.truffle.platform.sunmisc.SunMiscSignalManager;
 
-import jnr.ffi.LibraryLoader;
-import jnr.ffi.Runtime;
-import jnr.ffi.provider.MemoryManager;
-import jnr.posix.POSIX;
-import jnr.posix.POSIXFactory;
-
 public class SolarisPlatform implements NativePlatform {
 
     private final TrufflePosix posix;