commit 3aa7d2f0548d4fda0df94722127245896c2b3ead
author dslomov <dslomov@google.com> Tue Apr 11 17:55:55 2017 +0000
committer Jakob Buchgraber <buchgr@google.com> Wed Apr 12 11:49:05 2017 +0200
tree 5c810f13cf6a77caa57dabb1bc2101acf7211b64
parent 350f63822c6f693e2742166c690ea013979ab896

Used 'DefaultInfo' instead of `ctx.default_provider`.

This follows our CamelCaseInfo naming conventions for providers.

RELNOTES: None.
PiperOrigin-RevId: 152832215

src/main/java/com/google/devtools/build/lib/analysis/DefaultProvider.java

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/DefaultProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/DefaultProvider.java
index c0c2a31..93b2646 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/DefaultProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/DefaultProvider.java
@@ -16,9 +16,10 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
+import com.google.devtools.build.lib.events.Location;
 import com.google.devtools.build.lib.packages.ClassObjectConstructor;
+import com.google.devtools.build.lib.packages.NativeClassObjectConstructor;
 import com.google.devtools.build.lib.packages.SkylarkClassObject;
-import com.google.devtools.build.lib.rules.SkylarkRuleContext;
 import com.google.devtools.build.lib.syntax.SkylarkNestedSet;
 import java.util.Map;
 
@@ -31,6 +32,17 @@
   private static final String DEFAULT_RUNFILES_FIELD = "default_runfiles";
   private static final String FILES_FIELD = "files";
 
+  public static final String SKYLARK_NAME = "DefaultInfo";
+  public static final ClassObjectConstructor SKYLARK_CONSTRUCTOR =
+      new NativeClassObjectConstructor(SKYLARK_NAME) {
+        @Override
+        protected SkylarkClassObject createInstanceFromSkylark(Object[] args, Location loc) {
+          @SuppressWarnings("unchecked")
+          Map<String, Object> kwargs = (Map<String, Object>) args[0];
+          return new SkylarkClassObject(this, kwargs, loc);
+        }
+      };
+
   private DefaultProvider(ClassObjectConstructor constructor, Map<String, Object> values) {
     super(constructor, values);
   }
@@ -52,7 +64,6 @@
         FILES_FIELD, SkylarkNestedSet.of(Artifact.class, fileProvider.getFilesToBuild()));
     attrBuilder.put(FilesToRunProvider.SKYLARK_NAME, filesToRunProvider);
 
-    ClassObjectConstructor constructor = SkylarkRuleContext.getDefaultProvider();
-    return new DefaultProvider(constructor, attrBuilder.build());
+    return new DefaultProvider(SKYLARK_CONSTRUCTOR, attrBuilder.build());
   }
 }