Skip to content

Commit ebb70f9

Browse files
authored
Merge branch 'master' into generic-method-lambda-arg-wildcard
2 parents b2f8480 + 4038162 commit ebb70f9

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

gradle/wrapper/gradle-wrapper.jar

542 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=72f44c9f8ebcb1af43838f45ee5c4aa9c5444898b3468ab3f4af7b6076c5bc3f
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
3+
distributionSha256Sum=b266d5ff6b90eada6dc3b20cb090e3731302e553a27c5d3e4df1f0d76beaff06
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

nullaway/src/main/java/com/uber/nullaway/NullabilityUtil.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,13 +206,13 @@ public static Stream<? extends AnnotationMirror> getAllAnnotations(Symbol symbol
206206
*/
207207
public static boolean hasAnyAnnotationMatching(
208208
Symbol symbol, Config config, Predicate<String> predicate) {
209+
// check for declaration annotations
209210
for (AnnotationMirror annotationMirror : symbol.getAnnotationMirrors()) {
210211
if (predicate.test(annotationMirror.getAnnotationType().toString())) {
211212
return true;
212213
}
213214
}
214-
// we need this loop over the type's annotation mirrors in cases like explicitly-annotated
215-
// lambda parameters, possibly due to bugs in javac
215+
// check for type use annotations
216216
for (AnnotationMirror annotationMirror : symbol.type.getAnnotationMirrors()) {
217217
if (predicate.test(annotationMirror.getAnnotationType().toString())) {
218218
return true;

0 commit comments

Comments
 (0)