From d3d05b2ad55f89f77832880e1088fc472dae1b81 Mon Sep 17 00:00:00 2001
From: cparsons <cparsons@google.com>
Date: Thu, 24 May 2018 12:12:07 -0700
Subject: Fix SkylarkCallable-annotation detection to appropriately handle
 methods with generic parameters

RELNOTES: None.
PiperOrigin-RevId: 197932265
---
 src/main/java/com/google/devtools/build/lib/syntax/SkylarkDict.java | 2 +-
 src/main/java/com/google/devtools/build/lib/syntax/SkylarkList.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/java/com/google/devtools/build/lib/syntax')

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkDict.java b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkDict.java
index 6f5c2ef751..9157de4b3c 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkDict.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkDict.java
@@ -377,7 +377,7 @@ public final class SkylarkDict<K, V> extends MutableMap<K, V>
       useLocation = true,
       useEnvironment = true
   )
-  public Runtime.NoneType clear(
+  public Runtime.NoneType clearDict(
       Location loc, Environment env)
       throws EvalException {
     clear(loc, env.mutability());
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkList.java b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkList.java
index 396e06457d..670c4d2c21 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkList.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkList.java
@@ -441,7 +441,7 @@ public abstract class SkylarkList<E> extends BaseMutableList<E>
         useLocation = true,
         useEnvironment = true
     )
-    public Runtime.NoneType remove(Object x, Location loc, Environment env)
+    public Runtime.NoneType removeObject(Object x, Location loc, Environment env)
         throws EvalException {
       for (int i = 0; i < size(); i++) {
         if (get(i).equals(x)) {
-- 
cgit v1.2.3