Remove _but_expect markers

jspecify · Apr 11, 2024 · 7c0e148 · 7c0e148
1 parent dad3df5
commit 7c0e148
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 27 deletions.
diff --git a/samples/AnnotatedElementIsAnnotationPresent.java b/samples/AnnotatedElementIsAnnotationPresent.java
@@ -32,7 +32,6 @@ Object check(AnnotatedElement element, Class<Foo> clazz) {
 
   Object checkWildcard(AnnotatedElement element, Class<? extends Foo> clazz) {
     if (element.isAnnotationPresent(clazz)) {
-      // :: error: jspecify_but_expect_error
       return element.getAnnotation(clazz);
     }
     return "";

diff --git a/samples/ComplexParametric.java b/samples/ComplexParametric.java
@@ -43,7 +43,7 @@ interface SuperSuper<T extends @Nullable Object> {
 
     void checkNeverNull(Lib<? extends Object> lib);
 
-    <U> void checkUnspecNull(Lib<@NullnessUnspecified U> lib);
+    <U extends @Nullable Object> void checkUnspecNull(Lib<@NullnessUnspecified U> lib);
   }
 
   interface SuperNeverNever<T extends Object & Foo> extends SuperSuper<T> {
@@ -82,7 +82,6 @@ default void x() {
 
   interface SuperNeverUnspec<T extends Object & @NullnessUnspecified Foo> extends SuperSuper<T> {
     default void x() {
-      // :: error: jspecify_but_expect_warning
       checkNeverNull(t());
       // :: error: jspecify_nullness_not_enough_information
       checkUnspecNull(t());
@@ -117,19 +116,18 @@ default void x() {
 
   interface SuperNeverUnionNull<T extends Object & @Nullable Foo> extends SuperSuper<T> {
     default void x() {
-      // :: error: jspecify_but_expect_error
       checkNeverNull(t());
-      // :: error: jspecify_nullness_not_enough_information jspecify_but_expect_error
+      // :: error: jspecify_nullness_not_enough_information
       checkUnspecNull(t());
       checkT(t());
       // :: error: jspecify_nullness_not_enough_information
       checkTUnspec(t());
       // :: error: jspecify_nullness_mismatch
       checkTUnionNull(t());
 
-      // :: error: jspecify_nullness_not_enough_information jspecify_but_expect_error
+      // :: error: jspecify_nullness_not_enough_information
       checkNeverNull(tUnspec());
-      // :: error: jspecify_nullness_not_enough_information jspecify_but_expect_error
+      // :: error: jspecify_nullness_not_enough_information
       checkUnspecNull(tUnspec());
       // :: error: jspecify_nullness_not_enough_information
       checkT(tUnspec());
@@ -140,7 +138,7 @@ default void x() {
 
       // :: error: jspecify_nullness_mismatch
       checkNeverNull(tUnionNull());
-      // :: error: jspecify_nullness_not_enough_information jspecify_but_expect_error
+      // :: error: jspecify_nullness_not_enough_information
       this.<T>checkUnspecNull(tUnionNull());
       // :: error: jspecify_nullness_mismatch
       checkT(tUnionNull());
@@ -152,7 +150,6 @@ default void x() {
 
   interface SuperUnspecNever<T extends @NullnessUnspecified Object & Foo> extends SuperSuper<T> {
     default void x() {
-      // :: error: jspecify_but_expect_warning
       checkNeverNull(t());
       // :: error: jspecify_nullness_not_enough_information
       checkUnspecNull(t());
@@ -197,19 +194,18 @@ interface SuperUnspecUnionNull<T extends @NullnessUnspecified Object & @Nullable
 
   interface SuperUnionNullNever<T extends @Nullable Object & Foo> extends SuperSuper<T> {
     default void x() {
-      // :: error: jspecify_but_expect_error
       checkNeverNull(t());
-      // :: error: jspecify_nullness_not_enough_information jspecify_but_expect_error
+      // :: error: jspecify_nullness_not_enough_information
       checkUnspecNull(t());
       checkT(t());
       // :: error: jspecify_nullness_not_enough_information
       checkTUnspec(t());
       // :: error: jspecify_nullness_mismatch
       checkTUnionNull(t());
 
-      // :: error: jspecify_nullness_not_enough_information jspecify_but_expect_error
+      // :: error: jspecify_nullness_not_enough_information
       checkNeverNull(tUnspec());
-      // :: error: jspecify_nullness_not_enough_information jspecify_but_expect_error
+      // :: error: jspecify_nullness_not_enough_information
       checkUnspecNull(tUnspec());
       // :: error: jspecify_nullness_not_enough_information
       checkT(tUnspec());
@@ -220,7 +216,7 @@ default void x() {
 
       // :: error: jspecify_nullness_mismatch
       checkNeverNull(tUnionNull());
-      // :: error: jspecify_nullness_not_enough_information jspecify_but_expect_error
+      // :: error: jspecify_nullness_not_enough_information
       this.<T>checkUnspecNull(tUnionNull());
       // :: error: jspecify_nullness_mismatch
       checkT(tUnionNull());
@@ -250,7 +246,7 @@ default void x() {
 
       // :: error: jspecify_nullness_mismatch
       checkNeverNull(tUnspec());
-      // :: error: jspecify_nullness_not_enough_information jspecify_but_expect_error
+      // :: error: jspecify_nullness_not_enough_information
       checkUnspecNull(tUnspec());
       // :: error: jspecify_nullness_not_enough_information
       checkT(tUnspec());
@@ -261,7 +257,7 @@ default void x() {
 
       // :: error: jspecify_nullness_mismatch
       checkNeverNull(tUnionNull());
-      // :: error: jspecify_nullness_not_enough_information jspecify_but_expect_error
+      // :: error: jspecify_nullness_not_enough_information
       this.<T>checkUnspecNull(tUnionNull());
       // :: error: jspecify_nullness_mismatch
       checkT(tUnionNull());

diff --git a/samples/MapGetWildcardValueType.java b/samples/MapGetWildcardValueType.java
@@ -21,15 +21,13 @@
 class MapGetWildcardValueType {
   Object keySetObject(Map<Object, ? extends Object> map) {
     for (Object o : map.keySet()) {
-      // :: error: jspecify_but_expect_error
       return map.get(o);
     }
     return "";
   }
 
   Object containsKeyObject(Map<Object, ? extends Object> map, Object o) {
     if (map.containsKey(o)) {
-      // :: error: jspecify_but_expect_error
       return map.get(o);
     }
     return "";
@@ -53,7 +51,6 @@ Object containsKeyObjectUnionNull(Map<Object, ? extends @Nullable Object> map, O
 
   <V extends @Nullable Object> V keySetV(Map<Object, ? extends V> map, V defaultValue) {
     for (Object o : map.keySet()) {
-      // :: error: jspecify_but_expect_error
       return map.get(o);
     }
     return defaultValue;
@@ -62,7 +59,6 @@ Object containsKeyObjectUnionNull(Map<Object, ? extends @Nullable Object> map, O
   <V extends @Nullable Object> V containsKeyV(
       Map<Object, ? extends V> map, Object o, V defaultValue) {
     if (map.containsKey(o)) {
-      // :: error: jspecify_but_expect_error
       return map.get(o);
     }
     return defaultValue;

diff --git a/samples/MultiBoundTypeVariableUnspecToObject.java b/samples/MultiBoundTypeVariableUnspecToObject.java
@@ -30,7 +30,7 @@ <T extends Object & Lib> Object x0(@NullnessUnspecified T x) {
   }
 
   <T extends Object & @Nullable Lib> Object x2(@NullnessUnspecified T x) {
-    // :: error: jspecify_nullness_not_enough_information jspecify_but_expect_error
+    // :: error: jspecify_nullness_not_enough_information
     return x;
   }
 
@@ -51,17 +51,17 @@ <T extends Object & Lib> Object x0(@NullnessUnspecified T x) {
   }
 
   <T extends @Nullable Object & Lib> Object x6(@NullnessUnspecified T x) {
-    // :: error: jspecify_nullness_not_enough_information jspecify_but_expect_error
+    // :: error: jspecify_nullness_not_enough_information
     return x;
   }
 
   <T extends @Nullable Object & @NullnessUnspecified Lib> Object x7(@NullnessUnspecified T x) {
-    // :: error: jspecify_nullness_not_enough_information jspecify_but_expect_error
+    // :: error: jspecify_nullness_not_enough_information
     return x;
   }
 
   <T extends @Nullable Object & @Nullable Lib> Object x8(@NullnessUnspecified T x) {
-    // :: error: jspecify_nullness_mismatch
+    // :: error: jspecify_nullness_not_enough_information
     return x;
   }
 

diff --git a/samples/MultiplePathsToTypeVariable.java b/samples/MultiplePathsToTypeVariable.java
@@ -47,13 +47,11 @@ <T> Object x3(TUnspecBounded<T, ? extends T> t) {
     return t.get();
   }
 
-  // :: error: jspecify_but_expect_warning
   <T> Object x4(TUnspecBounded<T, ? extends @NullnessUnspecified T> t) {
     // :: error: jspecify_nullness_not_enough_information
     return t.get();
   }
 
-  // :: error: jspecify_but_expect_warning
   <T> Object x5(TUnspecBounded<T, ? extends @Nullable T> t) {
     // :: error: jspecify_nullness_not_enough_information
     return t.get();

diff --git a/...ifiedTypeParameter/nullnessunspecifiedtypeparameter/NullnessUnspecifiedTypeParameter.java b/...ifiedTypeParameter/nullnessunspecifiedtypeparameter/NullnessUnspecifiedTypeParameter.java
@@ -31,8 +31,8 @@ class Test {}
 class Instances {
   static final NullnessUnspecifiedTypeParameter<Object> A1 =
       new NullnessUnspecifiedTypeParameter<>();
-  // :: error: jspecify_nullness_mismatch
   static final NullnessUnspecifiedTypeParameter<@Nullable Object> A2 =
+	  // :: error: jspecify_nullness_mismatch
       new NullnessUnspecifiedTypeParameter<>();
   static final Test X = new Test();
 }