Reformat.

jspecify · Jan 10, 2022 · 750c071 · 750c071
1 parent 0a2de06
commit 750c071
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/framework/src/main/java/org/checkerframework/common/basetype/BaseTypeVisitor.java b/framework/src/main/java/org/checkerframework/common/basetype/BaseTypeVisitor.java
@@ -2058,10 +2058,7 @@ public Void visitReturn(ReturnTree node, Void p) {
         visitorState.setAssignmentContext(Pair.of((Tree) node, ret));
 
         commonAssignmentCheck(
-            ret,
-            node.getExpression(),
-            "return",
-            extraArgForReturnTypeError(node.getExpression()));
+            ret, node.getExpression(), "return", extraArgForReturnTypeError(node.getExpression()));
       }
       return super.visitReturn(node, p);
     } finally {
@@ -3970,7 +3967,8 @@ private boolean checkParameters() {
         boolean success;
         if (isMethodReference) {
           success =
-              atypeFactory.getTypeHierarchy()
+              atypeFactory
+                  .getTypeHierarchy()
                   .isSubtype(overriddenParams.get(i), overriderParams.get(i));
         } else {
           success =

diff --git a/framework/src/main/java/org/checkerframework/framework/type/SupertypeFinder.java b/framework/src/main/java/org/checkerframework/framework/type/SupertypeFinder.java
@@ -251,7 +251,7 @@ private List<AnnotatedDeclaredType> supertypesFromElement(
        * becomes necessary when we merge the upstream implementation of capture conversion. The need
        * for this logic will be demonstrated by the forthcoming implementWithNullableTypeArgument
        * JSpecify sample input.
-       * 
+       *
        * Digression that I will eventually tie back to the main point: I had some trouble
        * reproducing the failure in that test until I changed my custom test runner (one that
        * predates the jspecifySamplesTest runner described at

diff --git a/framework/src/main/java/org/checkerframework/framework/type/TypeFromTypeTreeVisitor.java b/framework/src/main/java/org/checkerframework/framework/type/TypeFromTypeTreeVisitor.java
@@ -3,7 +3,6 @@
 import com.sun.source.tree.AnnotatedTypeTree;
 import com.sun.source.tree.ArrayTypeTree;
 import com.sun.source.tree.ClassTree;
-import com.sun.source.tree.ExpressionTree;
 import com.sun.source.tree.IdentifierTree;
 import com.sun.source.tree.IntersectionTypeTree;
 import com.sun.source.tree.MemberSelectTree;

diff --git a/framework/src/main/java/org/checkerframework/framework/util/defaults/Default.java b/framework/src/main/java/org/checkerframework/framework/util/defaults/Default.java
@@ -26,7 +26,9 @@ public Default(final AnnotationMirror anno, final Enum<?> location) {
     if (!(location instanceof TypeUseLocation)
         && !(location instanceof AdditionalTypeUseLocation)) {
       throw new IllegalArgumentException(
-          "location argument " + location + " has unrecognized class "
+          "location argument "
+              + location
+              + " has unrecognized class "
               + location.getDeclaringClass().getName());
     }
     this.anno = anno;

diff --git a/framework/src/main/java/org/checkerframework/framework/util/defaults/QualifierDefaults.java b/framework/src/main/java/org/checkerframework/framework/util/defaults/QualifierDefaults.java
@@ -1016,8 +1016,7 @@ public void reset() {
       private AnnotatedTypeMirror typeArgTiedToDeclaration = null;
 
       @Override
-      public Void visitExecutable(
-          AnnotatedExecutableType type, AnnotationMirror annotationMirror) {
+      public Void visitExecutable(AnnotatedExecutableType type, AnnotationMirror annotationMirror) {
         // Inlined from supermethod except for constructorReturnType logic.
         boolean isConstructor =
             type.getUnderlyingType().getReturnType().getKind() == TypeKind.VOID
@@ -1039,8 +1038,7 @@ public Void visitExecutable(
       }
 
       @Override
-      public Void visitDeclared(
-          AnnotatedDeclaredType type, AnnotationMirror annotationMirror) {
+      public Void visitDeclared(AnnotatedDeclaredType type, AnnotationMirror annotationMirror) {
         // Inlined from supermethod except for constructorReturnTypeArg logic.
 
         // Only declared types with type arguments might be recursive,