Make RuleClass serializable and remove Environment from it, since it was only being used for the transitive hash code and transitive label of its globals, which can be passed in explicitly.

Assert along the way that the transitive label of its globals is always non-null. That is currently the case, although there seems to be no hard invariant of the system that it is true. Might as well tighten it now.

PiperOrigin-RevId: 191103310

1 files changed, 1 insertions, 5 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/packages/RuleFormatter.java b/src/main/java/com/google/devtools/build/lib/packages/RuleFormatter.java
index a179df0c00..ce152820e4 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/RuleFormatter.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/RuleFormatter.java
@@ -44,10 +44,7 @@ public class RuleFormatter {
     if (isSkylark) {
       builder.setSkylarkEnvironmentHashCode(
           Preconditions.checkNotNull(
-              rule.getRuleClassObject()
-                  .getRuleDefinitionEnvironment()
-                  .getTransitiveContentHashCode(),
-              rule));
+              rule.getRuleClassObject().getRuleDefinitionEnvironmentHashCode(), rule));
     }
     for (Attribute attr : rule.getAttributes()) {
       Object rawAttributeValue = rawAttributeMapper.getRawAttributeValue(rule, attr);
@@ -116,4 +113,3 @@ public class RuleFormatter {
     return null;
   }
 }
-