aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2019-01-24 10:23:27 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-01-24 10:23:27 -0800
commit2de126d9865445231da41e7d097d57b1d69eeb5e (patch)
tree7f76ee9b70e24915c3813d98f1b3c9f77d208f17
parent9f8f005620f5c28f0e20775653739b1818154efa (diff)
parentf39733ccf6b98679aa70204682da7759e3644fac (diff)
downloadturbine-2de126d9865445231da41e7d097d57b1d69eeb5e.tar.gz
Restore some errorprone annotations
am: f39733ccf6 Change-Id: I006ece80290efd8ceb7227f7d8d9eb2192a2d068
-rw-r--r--java/com/google/turbine/bytecode/ClassReader.java2
-rw-r--r--java/com/google/turbine/parse/ConstExpressionParser.java2
-rw-r--r--java/com/google/turbine/parse/Parser.java2
3 files changed, 3 insertions, 3 deletions
diff --git a/java/com/google/turbine/bytecode/ClassReader.java b/java/com/google/turbine/bytecode/ClassReader.java
index c8b4734..a9e2402 100644
--- a/java/com/google/turbine/bytecode/ClassReader.java
+++ b/java/com/google/turbine/bytecode/ClassReader.java
@@ -18,6 +18,7 @@ package com.google.turbine.bytecode;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
+import com.google.errorprone.annotations.CheckReturnValue;
import com.google.turbine.bytecode.ClassFile.AnnotationInfo.ElementValue;
import com.google.turbine.bytecode.ClassFile.AnnotationInfo.ElementValue.ConstClassValue;
import com.google.turbine.bytecode.ClassFile.AnnotationInfo.ElementValue.EnumConstValue;
@@ -32,7 +33,6 @@ import com.google.turbine.model.TurbineFlag;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import javax.annotation.CheckReturnValue;
import javax.annotation.Nullable;
/** A JVMS ยง4 class file reader. */
diff --git a/java/com/google/turbine/parse/ConstExpressionParser.java b/java/com/google/turbine/parse/ConstExpressionParser.java
index 77fd486..7b0f8c5 100644
--- a/java/com/google/turbine/parse/ConstExpressionParser.java
+++ b/java/com/google/turbine/parse/ConstExpressionParser.java
@@ -20,6 +20,7 @@ import static com.google.common.collect.Iterables.getOnlyElement;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableList;
+import com.google.errorprone.annotations.CheckReturnValue;
import com.google.turbine.diag.TurbineError;
import com.google.turbine.diag.TurbineError.ErrorKind;
import com.google.turbine.model.Const;
@@ -29,7 +30,6 @@ import com.google.turbine.tree.Tree.ClassLiteral;
import com.google.turbine.tree.Tree.ClassTy;
import com.google.turbine.tree.Tree.Expression;
import com.google.turbine.tree.TurbineOperatorKind;
-import javax.annotation.CheckReturnValue;
import javax.annotation.Nullable;
/** A parser for compile-time constant expressions. */
diff --git a/java/com/google/turbine/parse/Parser.java b/java/com/google/turbine/parse/Parser.java
index aa6eb5d..3858619 100644
--- a/java/com/google/turbine/parse/Parser.java
+++ b/java/com/google/turbine/parse/Parser.java
@@ -29,6 +29,7 @@ import com.google.common.base.Joiner;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
+import com.google.errorprone.annotations.CheckReturnValue;
import com.google.turbine.diag.SourceFile;
import com.google.turbine.diag.TurbineError;
import com.google.turbine.diag.TurbineError.ErrorKind;
@@ -62,7 +63,6 @@ import java.util.ArrayDeque;
import java.util.Deque;
import java.util.EnumSet;
import java.util.List;
-import javax.annotation.CheckReturnValue;
import javax.annotation.Nullable;
/**