Rename modifiability qualifiers

mernst · mernst · commit e3aff7c980f7 · 2026-05-23T21:21:16.000-07:00
diff --git a/annotation-file-utilities/src/main/java/org/checkerframework/afu/scenelib/util/coll/WrapperMap.java b/annotation-file-utilities/src/main/java/org/checkerframework/afu/scenelib/util/coll/WrapperMap.java
@@ -4,7 +4,7 @@
 import java.util.Map;
 import java.util.Set;
 import org.checkerframework.checker.modifiability.qual.IteratorPolyMod;
-import org.checkerframework.checker.modifiability.qual.PolyShrink;
+import org.checkerframework.checker.modifiability.qual.PolyShrinkable;
 
 /**
  * A {@link WrapperMap} is a map all of whose methods delegate by default to those of a supplied
@@ -40,8 +40,8 @@ public boolean containsValue(Object value) {
 
   @SuppressWarnings("keyfor") // use of delegate object
   @Override
-  public @IteratorPolyMod @PolyShrink Set<java.util.Map.Entry<K, V>> entrySet(
-      @PolyShrink WrapperMap<K, V> this) {
+  public @IteratorPolyMod @PolyShrinkable Set<java.util.Map.Entry<K, V>> entrySet(
+      @PolyShrinkable WrapperMap<K, V> this) {
     return back.entrySet();
   }
 
diff --git a/buildSrc/src/main/groovy/cf-spotless.gradle b/buildSrc/src/main/groovy/cf-spotless.gradle
@@ -92,24 +92,24 @@ spotless {
       googleJavaFormat(libs.google.java.format.get().version)
     }
     formatAnnotations()
-        .addTypeAnnotation("BottomGrow")
-        .addTypeAnnotation("BottomReplace")
-        .addTypeAnnotation("BottomShrink")
+        .addTypeAnnotation("BottomGrowable")
+        .addTypeAnnotation("BottomReplaceable")
+        .addTypeAnnotation("BottomShrinkable")
         .addTypeAnnotation("Growable")
         .addTypeAnnotation("IteratorPolyMod")
         .addTypeAnnotation("Modifiable")
-        .addTypeAnnotation("PolyGrow")
+        .addTypeAnnotation("PolyGrowable")
         .addTypeAnnotation("PolyModifiable")
-        .addTypeAnnotation("PolyReplace")
-        .addTypeAnnotation("PolyShrink")
+        .addTypeAnnotation("PolyReplaceable")
+        .addTypeAnnotation("PolyShrinkable")
         .addTypeAnnotation("Replaceable")
         .addTypeAnnotation("Shrinkable")
         .addTypeAnnotation("Ungrowable")
-        .addTypeAnnotation("MaybeGrow")
+        .addTypeAnnotation("MaybeGrowable")
         .addTypeAnnotation("MaybeIteratorPolyMod")
         .addTypeAnnotation("MaybeModifiable")
-        .addTypeAnnotation("MaybeReplace")
-        .addTypeAnnotation("MaybeShrink")
+        .addTypeAnnotation("MaybeReplaceable")
+        .addTypeAnnotation("MaybeShrinkable")
         .addTypeAnnotation("Unmodifiable")
         .addTypeAnnotation("UnmodParam")
         .addTypeAnnotation("Unreplaceable")
diff --git a/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/BottomGrowable.java b/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/BottomGrowable.java
@@ -18,4 +18,4 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
 @SubtypeOf({Growable.class, Ungrowable.class})
-public @interface BottomGrow {}
+public @interface BottomGrowable {}
diff --git a/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/BottomReplaceable.java b/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/BottomReplaceable.java
@@ -18,4 +18,4 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
 @SubtypeOf({Replaceable.class, Unreplaceable.class})
-public @interface BottomReplace {}
+public @interface BottomReplaceable {}
diff --git a/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/BottomShrinkable.java b/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/BottomShrinkable.java
@@ -18,4 +18,4 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
 @SubtypeOf({Shrinkable.class, Unshrinkable.class})
-public @interface BottomShrink {}
+public @interface BottomShrinkable {}
diff --git a/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/Growable.java b/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/Growable.java
@@ -18,5 +18,5 @@
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
-@SubtypeOf(MaybeGrow.class)
+@SubtypeOf(MaybeGrowable.class)
 public @interface Growable {}
diff --git a/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/MaybeGrowable.java b/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/MaybeGrowable.java
@@ -21,4 +21,4 @@
 @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
 @SubtypeOf({})
 @DefaultQualifierInHierarchy
-public @interface MaybeGrow {}
+public @interface MaybeGrowable {}
diff --git a/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/MaybeModifiable.java b/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/MaybeModifiable.java
@@ -7,12 +7,12 @@
 import java.lang.annotation.Target;
 
 /**
- * Convenience alias meaning {@code @MaybeGrow @MaybeShrink @MaybeReplace}. Represents an unknown or
- * arbitrary modifiability capability; the checker cannot determine whether the collection is
- * growable, shrinkable, or replaceable.
+ * Convenience alias meaning {@code @MaybeGrowable @MaybeShrinkable @MaybeReplaceable}. Represents
+ * an unknown or arbitrary modifiability capability; the checker cannot determine whether the
+ * collection is growable, shrinkable, or replaceable.
  *
  * <p>This annotation is not part of the type hierarchy; the Modifiability Checker expands it to
- * {@code @MaybeGrow @MaybeShrink @MaybeReplace} on each annotated type.
+ * {@code @MaybeGrowable @MaybeShrinkable @MaybeReplaceable} on each annotated type.
  *
  * @checker_framework.manual #modifiability-checker Modifiability Checker
  */
diff --git a/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/MaybeReplaceable.java b/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/MaybeReplaceable.java
@@ -22,4 +22,4 @@
 @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
 @SubtypeOf({})
 @DefaultQualifierInHierarchy
-public @interface MaybeReplace {}
+public @interface MaybeReplaceable {}
diff --git a/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/MaybeShrinkable.java b/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/MaybeShrinkable.java
@@ -22,4 +22,4 @@
 @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
 @SubtypeOf({})
 @DefaultQualifierInHierarchy
-public @interface MaybeShrink {}
+public @interface MaybeShrinkable {}
diff --git a/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/Modifiable.java b/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/Modifiable.java
@@ -13,7 +13,7 @@
  *
  * <p>As an exception, {@code @Modifiable} means {@code @Maybe*} if the type does not support a
  * given category of operation; for example, {@code @Modifiable Iterator} means
- * {@code @MaybeGrow @Shrinkable @MaybeReplace Iterator}.
+ * {@code @MaybeGrowable @Shrinkable @MaybeReplaceable Iterator}.
  *
  * @checker_framework.manual #modifiability-checker Modifiability Checker
  */
diff --git a/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/PolyGrowable.java b/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/PolyGrowable.java
@@ -11,13 +11,13 @@
  * A polymorphic qualifier for the Grow hierarchy.
  *
  * <p>When used on a method, the Grow capability of the return type matches the Grow capability of
- * the argument or receiver annotated with {@code @PolyGrow}.
+ * the argument or receiver annotated with {@code @PolyGrowable}.
  *
  * @checker_framework.manual #modifiability-checker Modifiability Checker
  * @checker_framework.manual #qualifier-polymorphism Qualifier polymorphism
  */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
-@PolymorphicQualifier(MaybeGrow.class)
-public @interface PolyGrow {}
+@PolymorphicQualifier(MaybeGrowable.class)
+public @interface PolyGrowable {}
diff --git a/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/PolyModifiable.java b/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/PolyModifiable.java
@@ -4,8 +4,8 @@
 import java.lang.annotation.Target;
 
 /**
- * Convenience alias meaning {@code @PolyGrow @PolyReplace @PolyShrink}. A polymorphic qualifier for
- * all three modifiability hierarchies.
+ * Convenience alias meaning {@code @PolyGrowable @PolyReplaceable @PolyShrinkable}. A polymorphic
+ * qualifier for all three modifiability hierarchies.
  *
  * <p>You should write {@code @PolyModifiable} on methods that preserve or transfer modifiability,
  * such as {@code List.subList()}, {@code iterator()}, and {@code stream()}.
diff --git a/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/PolyReplaceable.java b/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/PolyReplaceable.java
@@ -11,13 +11,13 @@
  * A polymorphic qualifier for the Replace hierarchy.
  *
  * <p>When used on a method, the Replace capability of the return type matches the Replace
- * capability of the argument or receiver annotated with {@code @PolyReplace}.
+ * capability of the argument or receiver annotated with {@code @PolyReplaceable}.
  *
  * @checker_framework.manual #modifiability-checker Modifiability Checker
  * @checker_framework.manual #qualifier-polymorphism Qualifier polymorphism
  */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
-@PolymorphicQualifier(MaybeReplace.class)
-public @interface PolyReplace {}
+@PolymorphicQualifier(MaybeReplaceable.class)
+public @interface PolyReplaceable {}
diff --git a/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/PolyShrinkable.java b/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/PolyShrinkable.java
@@ -18,5 +18,5 @@
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
-@PolymorphicQualifier(MaybeShrink.class)
-public @interface PolyShrink {}
+@PolymorphicQualifier(MaybeShrinkable.class)
+public @interface PolyShrinkable {}
diff --git a/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/Replaceable.java b/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/Replaceable.java
@@ -18,5 +18,5 @@
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
-@SubtypeOf(MaybeReplace.class)
+@SubtypeOf(MaybeReplaceable.class)
 public @interface Replaceable {}
diff --git a/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/Shrinkable.java b/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/Shrinkable.java
@@ -18,5 +18,5 @@
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
-@SubtypeOf(MaybeShrink.class)
+@SubtypeOf(MaybeShrinkable.class)
 public @interface Shrinkable {}
diff --git a/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/Ungrowable.java b/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/Ungrowable.java
@@ -18,5 +18,5 @@
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
-@SubtypeOf(MaybeGrow.class)
+@SubtypeOf(MaybeGrowable.class)
 public @interface Ungrowable {}
diff --git a/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/UnmodParam.java b/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/UnmodParam.java
@@ -7,13 +7,13 @@
 import java.lang.annotation.Target;
 
 /**
- * Convenience alias meaning {@code @MaybeGrow @MaybeShrink @MaybeReplace}. This is a syntactic
- * sugar for {@link MaybeModifiable}. It is intended to be used on parameters of methods that are
- * not designed to change the parameter. This annotation is only allowed to be written within method
- * or constructor parameter types, or explicit receiver parameter types.
+ * Convenience alias meaning {@code @MaybeGrowable @MaybeShrinkable @MaybeReplaceable}. This is a
+ * syntactic sugar for {@link MaybeModifiable}. It is intended to be used on parameters of methods
+ * that are not designed to change the parameter. This annotation is only allowed to be written
+ * within method or constructor parameter types, or explicit receiver parameter types.
  *
  * <p>This annotation is not part of the type hierarchy; the Modifiability Checker expands it to
- * {@code @MaybeGrow @MaybeShrink @MaybeReplace} on each annotated type.
+ * {@code @MaybeGrowable @MaybeShrinkable @MaybeReplaceable} on each annotated type.
  *
  * @checker_framework.manual #modifiability-checker Modifiability Checker
  */
diff --git a/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/Unmodifiable.java b/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/Unmodifiable.java
@@ -13,7 +13,7 @@
  *
  * <p>As an exception, {@code @Unmodifiable} means {@code @Maybe*} if the type does not support a
  * given category of operation; for example, {@code @Unmodifiable Iterator} means
- * {@code @MaybeGrow @Unshrinkable @MaybeReplace Iterator}.
+ * {@code @MaybeGrowable @Unshrinkable @MaybeReplaceable Iterator}.
  *
  * @checker_framework.manual #modifiability-checker Modifiability Checker
  */
diff --git a/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/Unreplaceable.java b/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/Unreplaceable.java
@@ -18,5 +18,5 @@
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
-@SubtypeOf(MaybeReplace.class)
+@SubtypeOf(MaybeReplaceable.class)
 public @interface Unreplaceable {}
diff --git a/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/Unshrinkable.java b/checker-qual/src/main/java/org/checkerframework/checker/modifiability/qual/Unshrinkable.java
@@ -18,5 +18,5 @@
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
-@SubtypeOf(MaybeShrink.class)
+@SubtypeOf(MaybeShrinkable.class)
 public @interface Unshrinkable {}
diff --git a/checker/src/main/java/org/checkerframework/checker/modifiability/grow/GrowAnnotatedTypeFactory.java b/checker/src/main/java/org/checkerframework/checker/modifiability/grow/GrowAnnotatedTypeFactory.java
@@ -12,14 +12,14 @@
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.Types;
 import org.checkerframework.checker.modifiability.ModifiabilityMethodUtils;
-import org.checkerframework.checker.modifiability.qual.BottomGrow;
+import org.checkerframework.checker.modifiability.qual.BottomGrowable;
 import org.checkerframework.checker.modifiability.qual.Growable;
 import org.checkerframework.checker.modifiability.qual.IteratorPolyMod;
-import org.checkerframework.checker.modifiability.qual.MaybeGrow;
+import org.checkerframework.checker.modifiability.qual.MaybeGrowable;
 import org.checkerframework.checker.modifiability.qual.MaybeIteratorPolyMod;
 import org.checkerframework.checker.modifiability.qual.MaybeModifiable;
 import org.checkerframework.checker.modifiability.qual.Modifiable;
-import org.checkerframework.checker.modifiability.qual.PolyGrow;
+import org.checkerframework.checker.modifiability.qual.PolyGrowable;
 import org.checkerframework.checker.modifiability.qual.PolyModifiable;
 import org.checkerframework.checker.modifiability.qual.Ungrowable;
 import org.checkerframework.checker.modifiability.qual.UnmodParam;
@@ -48,7 +48,7 @@ public class GrowAnnotatedTypeFactory extends BaseAnnotatedTypeFactory {
 
   // ── Hierarchy qualifiers ──────────
 
-  /** The {@code @}{@link MaybeGrow} qualifier (top of Grow hierarchy). */
+  /** The {@code @}{@link MaybeGrowable} qualifier (top of Grow hierarchy). */
   private final AnnotationMirror MAYBE_GROW;
 
   /** The {@code @}{@link Growable} qualifier. */
@@ -57,7 +57,7 @@ public class GrowAnnotatedTypeFactory extends BaseAnnotatedTypeFactory {
   /** The {@code @}{@link Ungrowable} qualifier. */
   private final AnnotationMirror UNGROWABLE;
 
-  /** The {@code @}{@link PolyGrow} qualifier. */
+  /** The {@code @}{@link PolyGrowable} qualifier. */
   private final AnnotationMirror POLY_GROW;
 
   /** The {@code @}{@link IteratorPolyMod} qualifier. */
@@ -80,10 +80,10 @@ public GrowAnnotatedTypeFactory(BaseTypeChecker checker) {
     this.listIteratorErasure =
         types.erasure(getElementUtils().getTypeElement("java.util.ListIterator").asType());
     // Initialize annotation mirrors after the hierarchy is established.
-    this.MAYBE_GROW = AnnotationBuilder.fromClass(getElementUtils(), MaybeGrow.class);
+    this.MAYBE_GROW = AnnotationBuilder.fromClass(getElementUtils(), MaybeGrowable.class);
     this.GROWABLE = AnnotationBuilder.fromClass(getElementUtils(), Growable.class);
     this.UNGROWABLE = AnnotationBuilder.fromClass(getElementUtils(), Ungrowable.class);
-    this.POLY_GROW = AnnotationBuilder.fromClass(getElementUtils(), PolyGrow.class);
+    this.POLY_GROW = AnnotationBuilder.fromClass(getElementUtils(), PolyGrowable.class);
     this.ITERATOR_PRESERVE_REMOVE =
         AnnotationBuilder.fromClass(getElementUtils(), IteratorPolyMod.class);
 
@@ -94,11 +94,11 @@ public GrowAnnotatedTypeFactory(BaseTypeChecker checker) {
   protected Set<Class<? extends Annotation>> createSupportedTypeQualifiers() {
     return new LinkedHashSet<>(
         Arrays.asList(
-            MaybeGrow.class,
+            MaybeGrowable.class,
             Growable.class,
             Ungrowable.class,
-            BottomGrow.class,
-            PolyGrow.class,
+            BottomGrowable.class,
+            PolyGrowable.class,
             MaybeIteratorPolyMod.class,
             IteratorPolyMod.class));
   }
@@ -109,13 +109,13 @@ protected Set<Class<? extends Annotation>> createSupportedTypeQualifiers() {
    *
    * <p>{@code @Modifiable} and {@code @Unmodifiable} claim all component capabilities, so on types
    * that cannot grow structurally, such as {@code Map.Entry} and non-{@code ListIterator} {@code
-   * Iterator}, their grow component canonicalizes to {@code @MaybeGrow}. Explicit grow qualifiers
-   * are left to normal canonicalization so users can still write and preserve an explicit
-   * capability tuple such as {@code @Growable @Shrinkable @Replaceable Iterator}.
+   * Iterator}, their grow component canonicalizes to {@code @MaybeGrowable}. Explicit grow
+   * qualifiers are left to normal canonicalization so users can still write and preserve an
+   * explicit capability tuple such as {@code @Growable @Shrinkable @Replaceable Iterator}.
    *
-   * <p>{@code @PolyModifiable} is different: it should usually become {@code @PolyGrow}, but for
-   * {@code Map.Entry} only the replace bit is meaningful to carry from the map receiver. Its grow
-   * bit is therefore {@code @MaybeGrow}.
+   * <p>{@code @PolyModifiable} is different: it should usually become {@code @PolyGrowable}, but
+   * for {@code Map.Entry} only the replace bit is meaningful to carry from the map receiver. Its
+   * grow bit is therefore {@code @MaybeGrowable}.
    */
   @Override
   public AnnotationMirror canonicalAnnotation(
@@ -158,14 +158,14 @@ protected ParameterizedExecutableType methodFromUse(
    * ArrayList. A stub annotation like
    *
    * <pre>{@code
-   * static <T> @PolyGrow List<T> withoutDuplicates(@PolyGrow Collection<T> values)
+   * static <T> @PolyGrowable List<T> withoutDuplicates(@PolyGrowable Collection<T> values)
    * }</pre>
    *
    * would be unsound, because an {@code @Ungrowable} input could receive the fresh ArrayList, whose
    * static type should be {@code @Growable}. It would also be too imprecise to always use
-   * {@code @MaybeGrow}, because passing a {@code @Growable} collection guarantees that both
+   * {@code @MaybeGrowable}, because passing a {@code @Growable} collection guarantees that both
    * possible results are growable. Therefore, model the method here as preserving {@code @Growable}
-   * inputs and otherwise returning {@code @MaybeGrow}.
+   * inputs and otherwise returning {@code @MaybeGrowable}.
    *
    * @param tree the invocation of {@code withoutDuplicates}
    * @param methodType the annotated executable type of the invoked method
diff --git a/checker/src/main/java/org/checkerframework/checker/modifiability/grow/GrowChecker.java b/checker/src/main/java/org/checkerframework/checker/modifiability/grow/GrowChecker.java
@@ -14,8 +14,8 @@
  * UnsupportedOperationException} at run time due to calling a grow method on a collection.
  *
  * <p>The checker enforces the Modifiability type system, where {@code @Growable} collections can be
- * safely added to, {@code @Ungrowable} collections cannot, and {@code @MaybeGrow} collections have
- * unknown grow behavior.
+ * safely added to, {@code @Ungrowable} collections cannot, and {@code @MaybeGrowable} collections
+ * have unknown grow behavior.
  *
  * @checker_framework.manual #modifiability-checker Modifiability Checker
  */
diff --git a/checker/src/main/java/org/checkerframework/checker/modifiability/replace/ReplaceAnnotatedTypeFactory.java b/checker/src/main/java/org/checkerframework/checker/modifiability/replace/ReplaceAnnotatedTypeFactory.java
diff --git a/checker/src/main/java/org/checkerframework/checker/modifiability/replace/ReplaceChecker.java b/checker/src/main/java/org/checkerframework/checker/modifiability/replace/ReplaceChecker.java
diff --git a/checker/src/main/java/org/checkerframework/checker/modifiability/shrink/ShrinkAnnotatedTypeFactory.java b/checker/src/main/java/org/checkerframework/checker/modifiability/shrink/ShrinkAnnotatedTypeFactory.java
diff --git a/checker/src/main/java/org/checkerframework/checker/modifiability/shrink/ShrinkChecker.java b/checker/src/main/java/org/checkerframework/checker/modifiability/shrink/ShrinkChecker.java
diff --git a/checker/tests/modifiability/AliasCanonicalizationTest.java b/checker/tests/modifiability/AliasCanonicalizationTest.java
diff --git a/checker/tests/modifiability/HierarchyTest.java b/checker/tests/modifiability/HierarchyTest.java
diff --git a/checker/tests/modifiability/IteratorPrecisionTest.java b/checker/tests/modifiability/IteratorPrecisionTest.java
diff --git a/checker/tests/modifiability/PolyModifiableTest.java b/checker/tests/modifiability/PolyModifiableTest.java
diff --git a/checker/tests/modifiability/PolyShrinkTest.java b/checker/tests/modifiability/PolyShrinkTest.java
diff --git a/checker/tests/modifiability/SetTest.java b/checker/tests/modifiability/SetTest.java
diff --git a/docs/manual/modifiability-checker.tex b/docs/manual/modifiability-checker.tex
