1 files changed, 14 insertions, 12 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleClassFunctions.java b/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleClassFunctions.java
index 24803c108a..aefdfaf3c9 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleClassFunctions.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleClassFunctions.java
@@ -194,16 +194,18 @@ public class SkylarkRuleClassFunctions {
   @SkylarkSignature(
     name = "DefaultInfo",
     returnType = ClassObjectConstructor.class,
-    doc = "A provider that is provided by every rule, even if it iss not returned explicitly. "
-        + "A <code>DefaultInfo</code> accepts all special parameters that can be returned "
-        + "from rule implementation function in a struct, which are <code>runfiles</code>, "
-        + "<code>data_runfiles</code>, <code>default_runfiles</code>, "
-        + "<code>output_groups</code>, <code>instrumented_files</code>, and all "
-        + "<a href=\"skylark-provider.html\">providers</a> that are available on built-in rules. "
-        + "Each instance of the default provider contains the following standard fields: "
-        + "<code>data_runfiles</code>, <code>default_runfiles</code>, <code>files</code>, "
-        + "and <code>files_to_run</code>. The values of these fields are equivalent to the "
-        + "values of the corresponding fields of the target the default provider belongs to."
+    doc =
+        "A provider that is provided by every rule, even if it iss not returned explicitly. "
+            + "A <code>DefaultInfo</code> accepts all special parameters that can be returned "
+            + "from rule implementation function in a struct, which are <code>runfiles</code>, "
+            + "<code>data_runfiles</code>, <code>default_runfiles</code>, <code>files</code>, "
+            + "<code>output_groups</code>, <code>instrumented_files</code>, and all "
+            + "<a href=\"skylark-provider.html\">providers</a> that are available on built-in " 
+            + "rules. Each instance of the default provider contains the following standard "
+            + "fields: <code>data_runfiles</code>, <code>default_runfiles</code>, "
+            + "<code>files</code>, and <code>files_to_run</code>. The values of these fields "
+            + "are equivalent to the values of the corresponding fields of the target "
+            + "the default provider belongs to."
   )
   private static final ClassObjectConstructor defaultInfo = DefaultProvider.SKYLARK_CONSTRUCTOR;
 
@@ -226,7 +228,7 @@ public class SkylarkRuleClassFunctions {
   )
   private static final ClassObjectConstructor actions = ActionsProvider.SKYLARK_CONSTRUCTOR;
 
-  @SkylarkSignature(name = "provider", returnType = SkylarkClassObjectConstructor.class, doc =
+  @SkylarkSignature(name = "provider", returnType = ClassObjectConstructor.class, doc =
       "Creates a declared provider 'constructor'. The return value of this"
           + "function can be used to create \"struct-like\" values. Example:<br>"
           + "<pre class=\"language-python\">data = provider()\n"
@@ -236,7 +238,7 @@ public class SkylarkRuleClassFunctions {
   )
   private static final BuiltinFunction provider =
       new BuiltinFunction("provider") {
-        public SkylarkClassObjectConstructor invoke(Location location) {
+        public ClassObjectConstructor invoke(Location location) {
           return new SkylarkClassObjectConstructor(
               "<no name>", // name is set on export.
               location);