Use Ipair instead of Pair in all files

opprop · Mar 29, 2024 · eb9a391 · eb9a391
1 parent 13f832c
commit eb9a391
Show file tree

Hide file tree

Showing 17 changed files with 27 additions and 51 deletions.
diff --git a/src/checkers/inference/BaseInferrableChecker.java b/src/checkers/inference/BaseInferrableChecker.java
@@ -6,12 +6,9 @@
 import org.checkerframework.framework.flow.CFTransfer;
 import org.checkerframework.framework.flow.CFValue;
 import org.checkerframework.framework.type.GenericAnnotatedTypeFactory;
-import org.checkerframework.javacutil.Pair;
 import java.lang.annotation.Annotation;
 import java.util.Collections;
-import java.util.List;
 import java.util.Set;
-import javax.lang.model.element.VariableElement;
 
 import checkers.inference.dataflow.InferenceAnalysis;
 import checkers.inference.dataflow.InferenceTransfer;

diff --git a/src/checkers/inference/InferenceAnnotatedTypeFactory.java b/src/checkers/inference/InferenceAnnotatedTypeFactory.java
@@ -1,8 +1,6 @@
 package checkers.inference;
 
-import checkers.inference.model.ConstantSlot;
 import checkers.inference.model.Slot;
-import com.sun.source.util.TreePath;
 import org.checkerframework.common.basetype.BaseAnnotatedTypeFactory;
 import org.checkerframework.framework.flow.CFAbstractAnalysis;
 import org.checkerframework.framework.flow.CFAnalysis;
@@ -25,18 +23,14 @@
 import org.checkerframework.framework.type.visitor.AnnotatedTypeScanner;
 import org.checkerframework.framework.util.AnnotatedTypes;
 import org.checkerframework.framework.util.defaults.QualifierDefaults;
-import org.checkerframework.framework.util.dependenttypes.DependentTypesHelper;
 import org.checkerframework.javacutil.AnnotationBuilder;
 import org.checkerframework.javacutil.AnnotationMirrorSet;
 import org.checkerframework.javacutil.BugInCF;
 import org.checkerframework.javacutil.ElementUtils;
-import org.checkerframework.javacutil.Pair;
 import org.checkerframework.javacutil.TreeUtils;
 
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
@@ -49,14 +43,12 @@
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.element.TypeParameterElement;
-import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.type.TypeVariable;
 
 import checkers.inference.dataflow.InferenceAnalysis;
 import checkers.inference.model.ConstraintManager;
-import checkers.inference.model.Slot;
 import checkers.inference.qual.VarAnnot;
 import checkers.inference.util.ConstantToVariableAnnotator;
 import checkers.inference.util.InferenceUtil;

diff --git a/src/checkers/inference/InferrableChecker.java b/src/checkers/inference/InferrableChecker.java
@@ -6,12 +6,9 @@
 import org.checkerframework.framework.flow.CFTransfer;
 import org.checkerframework.framework.flow.CFValue;
 import org.checkerframework.framework.type.GenericAnnotatedTypeFactory;
-import org.checkerframework.javacutil.Pair;
 import java.lang.annotation.Annotation;
-import java.util.List;
 import java.util.Set;
 import javax.annotation.processing.ProcessingEnvironment;
-import javax.lang.model.element.VariableElement;
 
 import checkers.inference.dataflow.InferenceAnalysis;
 import checkers.inference.model.ConstraintManager;

diff --git a/src/checkers/inference/VariableAnnotator.java b/src/checkers/inference/VariableAnnotator.java
@@ -14,10 +14,8 @@
 import org.checkerframework.framework.type.visitor.AnnotatedTypeScanner;
 import org.checkerframework.javacutil.AnnotationBuilder;
 import org.checkerframework.javacutil.AnnotationMirrorSet;
-import org.checkerframework.javacutil.AnnotationUtils;
 import org.checkerframework.javacutil.ElementUtils;
 import org.checkerframework.javacutil.BugInCF;
-import org.checkerframework.javacutil.Pair;
 import org.checkerframework.javacutil.TreePathUtil;
 import org.checkerframework.javacutil.TreeUtils;
 import org.checkerframework.javacutil.TypesUtils;

diff --git a/src/checkers/inference/dataflow/InferenceAnalysis.java b/src/checkers/inference/dataflow/InferenceAnalysis.java
@@ -1,11 +1,7 @@
 package checkers.inference.dataflow;
 
-import java.util.List;
-import java.util.Set;
 import java.util.logging.Logger;
 
-import javax.lang.model.element.AnnotationMirror;
-import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 
@@ -17,7 +13,6 @@
 import org.checkerframework.framework.type.GenericAnnotatedTypeFactory;
 import org.checkerframework.javacutil.AnnotationMirrorSet;
 import org.checkerframework.javacutil.BugInCF;
-import org.checkerframework.javacutil.Pair;
 
 import checkers.inference.InferenceChecker;
 import checkers.inference.InferrableChecker;

diff --git a/src/checkers/inference/dataflow/InferenceTransfer.java b/src/checkers/inference/dataflow/InferenceTransfer.java
@@ -14,7 +14,6 @@
 import org.checkerframework.framework.type.AnnotatedTypeMirror;
 import org.checkerframework.framework.type.AnnotatedTypeMirror.AnnotatedTypeVariable;
 import org.checkerframework.javacutil.BugInCF;
-import org.checkerframework.javacutil.Pair;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/src/checkers/inference/util/ASTPathUtil.java b/src/checkers/inference/util/ASTPathUtil.java
@@ -15,7 +15,6 @@
 import org.checkerframework.framework.type.visitor.AnnotatedTypeScanner;
 import org.checkerframework.framework.util.AnnotatedTypes;
 import org.checkerframework.javacutil.BugInCF;
-import org.checkerframework.javacutil.Pair;
 
 import java.util.IdentityHashMap;
 import java.util.logging.Logger;

diff --git a/src/checkers/inference/util/JaifBuilder.java b/src/checkers/inference/util/JaifBuilder.java
@@ -22,7 +22,6 @@
 
 import com.sun.source.tree.Tree;
 
-import org.checkerframework.javacutil.Pair;
 import org.checkerframework.org.plumelib.util.IPair;
 
 /**

diff --git a/tests/checkers/inference/DataflowInferenceTest.java b/tests/checkers/inference/DataflowInferenceTest.java
@@ -5,7 +5,7 @@
 import java.util.List;
 
 import org.checkerframework.framework.test.TestUtilities;
-import org.checkerframework.javacutil.Pair;
+import org.checkerframework.org.plumelib.util.IPair;
 import org.junit.runners.Parameterized.Parameters;
 
 import checkers.inference.test.CFInferenceTest;
@@ -19,8 +19,8 @@ public DataflowInferenceTest(File testFile) {
     }
 
     @Override
-    public Pair<String, List<String>> getSolverNameAndOptions() {
-        return Pair.<String, List<String>> of(DataflowSolverEngine.class.getCanonicalName(),
+    public IPair<String, List<String>> getSolverNameAndOptions() {
+        return IPair.<String, List<String>> of(DataflowSolverEngine.class.getCanonicalName(),
                 new ArrayList<String>());
     }
 

diff --git a/tests/checkers/inference/IFlowSinkPropTest.java b/tests/checkers/inference/IFlowSinkPropTest.java
@@ -2,7 +2,7 @@
 
 import checkers.inference.test.CFInferenceTest;
 import org.checkerframework.framework.test.TestUtilities;
-import org.checkerframework.javacutil.Pair;
+import org.checkerframework.org.plumelib.util.IPair;
 import org.junit.runners.Parameterized.Parameters;
 import sparta.checkers.IFlowSinkChecker;
 import sparta.checkers.propagation.IFlowSinkSolver;
@@ -19,8 +19,8 @@ public IFlowSinkPropTest(File testFile) {
     }
 
     @Override
-    public Pair<String, List<String>> getSolverNameAndOptions() {
-        return Pair.<String, List<String>>of(IFlowSinkSolver.class.getCanonicalName(), new ArrayList<String>());
+    public IPair<String, List<String>> getSolverNameAndOptions() {
+        return IPair.<String, List<String>>of(IFlowSinkSolver.class.getCanonicalName(), new ArrayList<String>());
     }
 
     @Parameters

diff --git a/tests/checkers/inference/IFlowSinkSatTest.java b/tests/checkers/inference/IFlowSinkSatTest.java
@@ -2,7 +2,7 @@
 
 import checkers.inference.test.CFInferenceTest;
 import org.checkerframework.framework.test.TestUtilities;
-import org.checkerframework.javacutil.Pair;
+import org.checkerframework.org.plumelib.util.IPair;
 import org.junit.runners.Parameterized.Parameters;
 import sparta.checkers.IFlowSinkChecker;
 import sparta.checkers.sat.SinkSolver;
@@ -19,8 +19,8 @@ public IFlowSinkSatTest(File testFile) {
     }
 
     @Override
-    public Pair<String, List<String>> getSolverNameAndOptions() {
-        return Pair.<String, List<String>>of(SinkSolver.class.getCanonicalName(), new ArrayList<String>());
+    public IPair<String, List<String>> getSolverNameAndOptions() {
+        return IPair.<String, List<String>>of(SinkSolver.class.getCanonicalName(), new ArrayList<String>());
     }
 
     @Parameters

diff --git a/tests/checkers/inference/IFlowSourcePropTest.java b/tests/checkers/inference/IFlowSourcePropTest.java
@@ -2,7 +2,7 @@
 
 import checkers.inference.test.CFInferenceTest;
 import org.checkerframework.framework.test.TestUtilities;
-import org.checkerframework.javacutil.Pair;
+import org.checkerframework.org.plumelib.util.IPair;
 import org.junit.runners.Parameterized.Parameters;
 import sparta.checkers.IFlowSourceChecker;
 import sparta.checkers.propagation.IFlowSourceSolver;
@@ -19,8 +19,8 @@ public IFlowSourcePropTest(File testFile) {
     }
 
     @Override
-    public Pair<String, List<String>> getSolverNameAndOptions() {
-        return Pair.<String, List<String>>of(IFlowSourceSolver.class.getCanonicalName(), new ArrayList<String>());
+    public IPair<String, List<String>> getSolverNameAndOptions() {
+        return IPair.<String, List<String>>of(IFlowSourceSolver.class.getCanonicalName(), new ArrayList<String>());
     }
 
     @Parameters

diff --git a/tests/checkers/inference/IFlowSourceSatTest.java b/tests/checkers/inference/IFlowSourceSatTest.java
@@ -2,7 +2,7 @@
 
 import checkers.inference.test.CFInferenceTest;
 import org.checkerframework.framework.test.TestUtilities;
-import org.checkerframework.javacutil.Pair;
+import org.checkerframework.org.plumelib.util.IPair;
 import org.junit.runners.Parameterized.Parameters;
 import sparta.checkers.IFlowSourceChecker;
 import sparta.checkers.sat.SourceSolver;
@@ -19,8 +19,8 @@ public IFlowSourceSatTest(File testFile) {
     }
 
     @Override
-    public Pair<String, List<String>> getSolverNameAndOptions() {
-        return Pair.<String, List<String>>of(SourceSolver.class.getCanonicalName(), new ArrayList<String>());
+    public IPair<String, List<String>> getSolverNameAndOptions() {
+        return IPair.<String, List<String>>of(SourceSolver.class.getCanonicalName(), new ArrayList<String>());
     }
 
     @Parameters

diff --git a/tests/checkers/inference/InterningTest.java b/tests/checkers/inference/InterningTest.java
@@ -3,7 +3,7 @@
 import checkers.inference.solver.MaxSat2TypeSolver;
 import checkers.inference.test.CFInferenceTest;
 import org.checkerframework.framework.test.TestUtilities;
-import org.checkerframework.javacutil.Pair;
+import org.checkerframework.org.plumelib.util.IPair;
 import org.junit.runners.Parameterized.Parameters;
 
 import java.io.File;
@@ -18,8 +18,8 @@ public InterningTest(File testFile) {
     }
 
     @Override
-    public Pair<String, List<String>> getSolverNameAndOptions() {
-        return Pair.<String, List<String>>of(MaxSat2TypeSolver.class.getCanonicalName(), new ArrayList<String>());
+    public IPair<String, List<String>> getSolverNameAndOptions() {
+        return IPair.<String, List<String>>of(MaxSat2TypeSolver.class.getCanonicalName(), new ArrayList<String>());
     }
 
     @Parameters

diff --git a/tests/checkers/inference/NninfTest.java b/tests/checkers/inference/NninfTest.java
@@ -3,7 +3,7 @@
 import checkers.inference.solver.MaxSat2TypeSolver;
 import checkers.inference.test.CFInferenceTest;
 import org.checkerframework.framework.test.TestUtilities;
-import org.checkerframework.javacutil.Pair;
+import org.checkerframework.org.plumelib.util.IPair;
 import org.junit.runners.Parameterized.Parameters;
 
 import java.io.File;
@@ -18,8 +18,8 @@ public NninfTest(File testFile) {
     }
 
     @Override
-    public Pair<String, List<String>> getSolverNameAndOptions() {
-        return Pair.of(MaxSat2TypeSolver.class.getCanonicalName(), new ArrayList<>());
+    public IPair<String, List<String>> getSolverNameAndOptions() {
+        return IPair.of(MaxSat2TypeSolver.class.getCanonicalName(), new ArrayList<>());
     }
 
     @Parameters

diff --git a/tests/checkers/inference/OsTrustedTest.java b/tests/checkers/inference/OsTrustedTest.java
@@ -3,7 +3,7 @@
 import checkers.inference.solver.MaxSat2TypeSolver;
 import checkers.inference.test.CFInferenceTest;
 import org.checkerframework.framework.test.TestUtilities;
-import org.checkerframework.javacutil.Pair;
+import org.checkerframework.org.plumelib.util.IPair;
 import org.junit.runners.Parameterized.Parameters;
 
 import java.io.File;
@@ -18,8 +18,8 @@ public OsTrustedTest(File testFile) {
     }
 
     @Override
-    public Pair<String, List<String>> getSolverNameAndOptions() {
-        return Pair.<String, List<String>>of(MaxSat2TypeSolver.class.getCanonicalName(), new ArrayList<String>());
+    public IPair<String, List<String>> getSolverNameAndOptions() {
+        return IPair.<String, List<String>>of(MaxSat2TypeSolver.class.getCanonicalName(), new ArrayList<String>());
     }
 
     @Parameters

diff --git a/tests/checkers/inference/test/CFInferenceTest.java b/tests/checkers/inference/test/CFInferenceTest.java
@@ -2,7 +2,6 @@
 
 import org.checkerframework.framework.test.CheckerFrameworkPerFileTest;
 import org.checkerframework.framework.test.TestUtilities;
-import org.checkerframework.javacutil.Pair;
 import org.checkerframework.javacutil.SystemUtil;
 
 import java.io.File;
@@ -11,6 +10,7 @@
 
 import javax.annotation.processing.AbstractProcessor;
 
+import org.checkerframework.org.plumelib.util.IPair;
 import org.checkerframework.org.plumelib.util.SystemPlume;
 import org.junit.Test;
 
@@ -31,7 +31,7 @@ public boolean useHacks() {
         return SystemPlume.getBooleanSystemProperty("use.hacks");
     }
 
-    public abstract Pair<String, List<String>> getSolverNameAndOptions();
+    public abstract IPair<String, List<String>> getSolverNameAndOptions();
 
     public List<String> getAdditionalInferenceOptions() {
         return new ArrayList<String>();
@@ -49,7 +49,7 @@ public String getPathToInferenceScript() {
     @Test
     public void run() {
         boolean shouldEmitDebugInfo = TestUtilities.getShouldEmitDebugInfo();
-        Pair<String, List<String>> solverArgs = getSolverNameAndOptions();
+        IPair<String, List<String>> solverArgs = getSolverNameAndOptions();
 
         final File testDataDir = new File("testdata");
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,7 +22,6 @@ @@
     import com.sun.source.tree.Tree;
-    import org.checkerframework.javacutil.Pair;
     import org.checkerframework.org.plumelib.util.IPair;
     /**
@@ Expand Down @@