diff options
| author |  cparsons <cparsons@google.com> | 2018-05-24 12:12:07 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-05-24 12:13:38 -0700 |
| commit | d3d05b2ad55f89f77832880e1088fc472dae1b81 (patch) | |
| tree | 19a5dab6c2e65e26ab800cc70c5ec11a2be6b484 /src/main/java/com/google/devtools/build/lib/syntax | |
| parent | 17c85f366c9e4f6b6d8e7246e0a72ec317e54ac9 (diff) | |
Fix SkylarkCallable-annotation detection to appropriately handle methods with generic parameters
RELNOTES: None.
PiperOrigin-RevId: 197932265
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/syntax')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/syntax/SkylarkDict.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/syntax/SkylarkList.java | 2 |
2 files changed, 2 insertions, 2 deletions
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)) { |