Style changes from PR feedback

Author: Adam Hrbac

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ContextvarsModuleBuiltins.java

@@ -49,8 +49,8 @@
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.PythonBuiltins;
 import com.oracle.graal.python.builtins.objects.PNone;
-import com.oracle.graal.python.builtins.objects.contextvars.PContextVarsContext;
 import com.oracle.graal.python.builtins.objects.contextvars.PContextVar;
+import com.oracle.graal.python.builtins.objects.contextvars.PContextVarsContext;
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
@@ -112,7 +112,8 @@ Object construct(VirtualFrame frame, Object cls) {
     @GenerateNodeFactory
     public abstract static class TokenNode extends PythonUnaryBuiltinNode {
         @Specialization
-        Object construct(VirtualFrame frame, Object cls, @Cached PRaiseNode raise) {
+        Object construct(VirtualFrame frame, Object cls,
+                        @Cached PRaiseNode raise) {
             throw raise.raise(PythonBuiltinClassType.RuntimeError, ErrorMessages.TOKEN_ONLY_BY_CONTEXTVAR);
         }
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/contextvars/ContextBuiltins.java

@@ -74,16 +74,18 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
     @GenerateNodeFactory
     public abstract static class GetContextVar extends PythonBinaryBuiltinNode {
         @Specialization
-        Object get(PContextVarsContext self, Object key, @Cached PRaiseNode raise) {
+        Object get(PContextVarsContext self, Object key,
+                        @Cached PRaiseNode raise) {
             return getContextVar(self, key, null, raise);
         }
     }
 
-    @Builtin(name = "run", takesVarArgs = true, takesVarKeywordArgs = true, minNumOfPositionalArgs = 2, parameterNames = {"$self", "..."})
+    @Builtin(name = "run", takesVarArgs = true, takesVarKeywordArgs = true, minNumOfPositionalArgs = 2, parameterNames = {"$self", "$callable"})
     @GenerateNodeFactory
     public abstract static class Run extends PythonBuiltinNode {
         @Specialization
-        Object get(VirtualFrame frame, PContextVarsContext self, Object fun, Object[] args, PKeyword[] keywords, @Cached CallNode call) {
+        Object get(VirtualFrame frame, PContextVarsContext self, Object fun, Object[] args, PKeyword[] keywords,
+                        @Cached CallNode call) {
             PythonContext.PythonThreadState threadState = getContext().getThreadState(getLanguage());
             self.enter(threadState);
             try {
@@ -109,24 +111,27 @@ Object doCopy(PContextVarsContext self) {
     @GenerateNodeFactory
     public abstract static class GetMethod extends PythonBuiltinNode {
         @Specialization(guards = "isNoValue(def)")
-        Object doGet(PContextVarsContext self, Object key, Object def, @Cached PRaiseNode raise) {
+        Object doGet(PContextVarsContext self, Object key, Object def,
+                        @Cached PRaiseNode raise) {
             return doGetDefault(self, key, PNone.NONE, raise);
         }
 
         @Specialization(guards = "!isNoValue(def)")
-        Object doGetDefault(PContextVarsContext self, Object key, Object def, @Cached PRaiseNode raise) {
+        Object doGetDefault(PContextVarsContext self, Object key, Object def,
+                        @Cached PRaiseNode raise) {
             return getContextVar(self, key, def, raise);
         }
 
     }
 
-    private static Object getContextVar(PContextVarsContext self, Object key, Object def, @Cached PRaiseNode raise) {
+    private static Object getContextVar(PContextVarsContext self, Object key, Object def,
+                    @Cached PRaiseNode raise) {
         if (key instanceof PContextVar) {
             PContextVar ctxVar = (PContextVar) key;
             Object value = self.contextVarValues.lookup(key, ctxVar.getHash());
             if (value == null) {
                 if (def == null) {
-                    throw raise.raise(PythonBuiltinClassType.KeyError, ErrorMessages.S, key);
+                    throw raise.raise(PythonBuiltinClassType.KeyError, new Object[]{key});
                 } else {
                     return def;
                 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/contextvars/ContextVarBuiltins.java

@@ -95,7 +95,7 @@ Object get(VirtualFrame frame, PContextVar self, Object def) {
             if (self.getDefault() != PContextVar.NO_DEFAULT) {
                 return self.getDefault();
             }
-            throw raise(LookupError, ErrorMessages.S, self);
+            throw raise(LookupError, new Object[]{self});
         }
     }
 
@@ -115,7 +115,8 @@ Object set(VirtualFrame frame, PContextVar self, Object value) {
     @GenerateNodeFactory
     public abstract static class ResetNode extends PythonBinaryBuiltinNode {
         @Specialization
-        Object reset(PContextVar self, PContextVarsToken token, @Cached PRaiseNode raise) {
+        Object reset(PContextVar self, PContextVarsToken token,
+                        @Cached PRaiseNode raise) {
             if (self == token.getVar()) {
                 PythonContext.PythonThreadState threadState = getContext().getThreadState(getLanguage());
                 if (token.getOldValue() == PContextVarsToken.MISSING) {
@@ -131,7 +132,8 @@ Object reset(PContextVar self, PContextVarsToken token, @Cached PRaiseNode raise
         }
 
         @Specialization
-        Object doError(PContextVar self, Object token, @Cached PRaiseNode raise) {
+        Object doError(PContextVar self, Object token,
+                        @Cached PRaiseNode raise) {
             throw raise.raise(TypeError, ErrorMessages.INSTANCE_OF_TOKEN_EXPECTED, token);
         }
     }