Skylark: documentation is updated. SkylarkFileType.java is moved to the ../lib/rules package. Unused code is removed. Anchor for lists is fixed in the doc.

--
MOS_MIGRATED_REVID=89117189

3 files changed, 9 insertions, 23 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/SkylarkAttr.java b/src/main/java/com/google/devtools/build/lib/rules/SkylarkAttr.java
index 6ed199cb0c..93ba241a3a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/SkylarkAttr.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/SkylarkAttr.java
@@ -20,7 +20,6 @@ import com.google.devtools.build.lib.events.Location;
 import com.google.devtools.build.lib.packages.Attribute;
 import com.google.devtools.build.lib.packages.Attribute.ConfigurationTransition;
 import com.google.devtools.build.lib.packages.Attribute.SkylarkLateBound;
-import com.google.devtools.build.lib.packages.SkylarkFileType;
 import com.google.devtools.build.lib.packages.Type;
 import com.google.devtools.build.lib.packages.Type.ConversionException;
 import com.google.devtools.build.lib.syntax.Environment;
diff --git a/src/main/java/com/google/devtools/build/lib/packages/SkylarkFileType.java b/src/main/java/com/google/devtools/build/lib/rules/SkylarkFileType.java
index 73cfd6e051..be4a417845 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/SkylarkFileType.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/SkylarkFileType.java
@@ -11,16 +11,18 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.google.devtools.build.lib.packages;
+package com.google.devtools.build.lib.rules;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
+import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.syntax.SkylarkCallable;
 import com.google.devtools.build.lib.syntax.SkylarkModule;
 import com.google.devtools.build.lib.util.FileType;
-import com.google.devtools.build.lib.util.FileType.HasFilename;
 import com.google.devtools.build.lib.util.FileTypeSet;
 
+import java.util.List;
+
 /**
  * A wrapper class for FileType and FileTypeSet functionality in Skylark.
  */
@@ -43,12 +45,14 @@ public class SkylarkFileType {
     return FileTypeSet.of(fileType);
   }
 
-  @SkylarkCallable(doc = "")
-  public ImmutableList<HasFilename> filter(Iterable<HasFilename> files) {
+  @SkylarkCallable(doc =
+      "Returns a list created from the elements of the parameter containing all the "
+    + "<a href=\"#modules.File\"><code>File</code></a>s that match the FileType.")
+  public List<Artifact> filter(Iterable<Artifact> files) {
     return ImmutableList.copyOf(FileType.filter(files, fileType));
   }
 
-  @SkylarkCallable(doc = "")
+  @SkylarkCallable(doc = "Returns <code>True</code> if the parameter matches the FileType.")
   public boolean matches(String fileName) {
     return fileType.apply(fileName);
   }
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 39f9bf8cbf..6b71f62b71 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
@@ -50,7 +50,6 @@ import com.google.devtools.build.lib.packages.RuleClass.Builder;
 import com.google.devtools.build.lib.packages.RuleClass.Builder.RuleClassType;
 import com.google.devtools.build.lib.packages.RuleFactory;
 import com.google.devtools.build.lib.packages.RuleFactory.InvalidRuleException;
-import com.google.devtools.build.lib.packages.SkylarkFileType;
 import com.google.devtools.build.lib.packages.TargetUtils;
 import com.google.devtools.build.lib.packages.TestSize;
 import com.google.devtools.build.lib.packages.Type;
@@ -93,22 +92,6 @@ public class SkylarkRuleClassFunctions {
       doc = "The default runfiles collection state.")
   private static final Object hostTransition = ConfigurationTransition.HOST;
 
-  private static final Attribute.ComputedDefault DEPRECATION =
-      new Attribute.ComputedDefault() {
-        @Override
-        public Object getDefault(AttributeMap rule) {
-          return rule.getPackageDefaultDeprecation();
-        }
-      };
-
-  private static final Attribute.ComputedDefault TEST_ONLY =
-      new Attribute.ComputedDefault() {
-        @Override
-        public Object getDefault(AttributeMap rule) {
-          return rule.getPackageDefaultTestOnly();
-        }
-     };
-
   private static final LateBoundLabel<BuildConfiguration> RUN_UNDER =
       new LateBoundLabel<BuildConfiguration>() {
         @Override