Fix deprecations

PullRequest: truffleruby/653

Author: chrisseaton

src/main/java/org/truffleruby/core/thread/ThreadManager.java

@@ -12,7 +12,7 @@
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.TruffleException;
-import com.oracle.truffle.api.TruffleStackTraceElement;
+import com.oracle.truffle.api.TruffleStackTrace;
 import com.oracle.truffle.api.interop.TruffleObject;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.object.DynamicObject;
@@ -282,7 +282,7 @@ private static void setException(RubyContext context, DynamicObject thread, Dyna
         // to capture the backtrace from this thread.
         final TruffleException truffleException = Layouts.EXCEPTION.getBacktrace(exception).getRaiseException();
         if (truffleException != null) {
-            TruffleStackTraceElement.fillIn((Throwable) truffleException);
+            TruffleStackTrace.fillIn((Throwable) truffleException);
         }
 
         final DynamicObject mainThread = context.getThreadManager().getRootThread();

src/main/java/org/truffleruby/language/backtrace/Backtrace.java

@@ -11,6 +11,7 @@
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.TruffleException;
+import com.oracle.truffle.api.TruffleStackTrace;
 import com.oracle.truffle.api.TruffleStackTraceElement;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.RootNode;
@@ -49,7 +50,7 @@ public Backtrace copy(RubyContext context, DynamicObject exception) {
         // A Backtrace is 1-1-1 with a RaiseException and a Ruby exception
         RaiseException newRaiseException = new RaiseException(context, exception, this.raiseException.isInternalError());
         // Copy the TruffleStackTrace
-        TruffleStackTraceElement.fillIn(this.raiseException);
+        TruffleStackTrace.fillIn(this.raiseException);
         assert this.raiseException.getCause() != null;
         newRaiseException.initCause(this.raiseException.getCause());
         // Another way would be to copy the activations (copy.activations = getActivations()), but
@@ -88,7 +89,7 @@ public Activation[] getActivations(TruffleException truffleException) {
 
             // The stacktrace is computed here if it was not already computed and stored in the
             // TruffleException with TruffleStackTraceElement.fillIn().
-            final List<TruffleStackTraceElement> stackTrace = TruffleStackTraceElement.getStackTrace((Throwable) truffleException);
+            final List<TruffleStackTraceElement> stackTrace = TruffleStackTrace.getStacktrace((Throwable) truffleException);
 
             final List<Activation> activations = new ArrayList<>();
             final RubyContext context = RubyLanguage.getCurrentContext();

src/main/java/org/truffleruby/language/exceptions/TryNode.java

@@ -10,7 +10,7 @@
 package org.truffleruby.language.exceptions;
 
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.TruffleStackTraceElement;
+import com.oracle.truffle.api.TruffleStackTrace;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.ControlFlowException;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
@@ -88,7 +88,7 @@ private Object handleException(VirtualFrame frame, RaiseException exception) {
                      * therefore the exception is no longer being thrown on the exception path and the
                      * lazy stacktrace is no longer filled.
                      */
-                    TruffleStackTraceElement.fillIn(exception);
+                    TruffleStackTrace.fillIn(exception);
 
                     return setLastExceptionAndRunRescue(frame, exception, rescue);
                 }