C++: Renames CcExecutionDynamicLibrariesInfo to CcExecutionDynamicLib…

…raries Since it's not a provider, it doesn't need the Info suffix anymore. RELNOTES:none PiperOrigin-RevId: 196793557
werkt · May 16, 2018 · e440d59 · e440d59
1 parent 3aa9107
commit e440d59
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 42 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java
@@ -901,8 +901,8 @@ private static void addTransitiveInfoProviders(
     ccCompilationInfoBuilder.setCcCompilationContext(ccCompilationContext);
 
     CcLinkingInfo.Builder ccLinkingInfoBuilder = CcLinkingInfo.Builder.create();
-    ccLinkingInfoBuilder.setCcExecutionDynamicLibrariesInfo(
-        new CcExecutionDynamicLibrariesInfo(
+    ccLinkingInfoBuilder.setCcExecutionDynamicLibraries(
+        new CcExecutionDynamicLibraries(
             collectExecutionDynamicLibraryArtifacts(
                 ruleContext, linkingOutputs.getExecutionDynamicLibraries())));
 
@@ -946,11 +946,10 @@ private static NestedSet<Artifact> collectExecutionDynamicLibraryArtifacts(
     NestedSetBuilder<Artifact> builder = NestedSetBuilder.stableOrder();
     for (CcLinkingInfo ccLinkingInfo :
         ruleContext.getPrerequisites("deps", Mode.TARGET, CcLinkingInfo.PROVIDER)) {
-      CcExecutionDynamicLibrariesInfo ccExecutionDynamicLibrariesInfo =
-          ccLinkingInfo.getCcExecutionDynamicLibrariesInfo();
-      if (ccExecutionDynamicLibrariesInfo != null) {
-        builder.addTransitive(
-            ccExecutionDynamicLibrariesInfo.getExecutionDynamicLibraryArtifacts());
+      CcExecutionDynamicLibraries ccExecutionDynamicLibraries =
+          ccLinkingInfo.getCcExecutionDynamicLibraries();
+      if (ccExecutionDynamicLibraries != null) {
+        builder.addTransitive(ccExecutionDynamicLibraries.getExecutionDynamicLibraryArtifacts());
       }
     }
 

diff --git a/.../cpp/CcExecutionDynamicLibrariesInfo.java → ...ules/cpp/CcExecutionDynamicLibraries.java b/.../cpp/CcExecutionDynamicLibrariesInfo.java → ...ules/cpp/CcExecutionDynamicLibraries.java
@@ -22,22 +22,22 @@
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory;
 
-/** A target that provides the execution-time dynamic libraries of a C++ rule. */
+/** An object that contains the execution-time dynamic libraries of a C++ rule. */
 @Immutable
 @AutoCodec
 @SkylarkModule(
-  name = "cc_execution_dynamic_libraries_info ",
+  name = "cc_execution_dynamic_libraries ",
   documented = false,
   category = SkylarkModuleCategory.PROVIDER,
   doc = "."
 )
-public final class CcExecutionDynamicLibrariesInfo {
-  public static final CcExecutionDynamicLibrariesInfo EMPTY =
-      new CcExecutionDynamicLibrariesInfo(NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER));
+public final class CcExecutionDynamicLibraries {
+  public static final CcExecutionDynamicLibraries EMPTY =
+      new CcExecutionDynamicLibraries(NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER));
 
   private final NestedSet<Artifact> ccExecutionDynamicLibraries;
 
-  public CcExecutionDynamicLibrariesInfo(NestedSet<Artifact> ccExecutionDynamicLibraries) {
+  public CcExecutionDynamicLibraries(NestedSet<Artifact> ccExecutionDynamicLibraries) {
     this.ccExecutionDynamicLibraries = ccExecutionDynamicLibraries;
   }
 

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java
@@ -375,8 +375,8 @@ private static CcLinkingInfo overrideRunfilesProvider(
         (CcLinkingInfo) linkingInfo.getProviders().getProvider(CcLinkingInfo.PROVIDER.getKey());
     CcLinkingInfo.Builder ccLinkingInfoBuilder = CcLinkingInfo.Builder.create();
     ccLinkingInfoBuilder.setCcLinkParamsStore(ccLinkingInfo.getCcLinkParamsStore());
-    ccLinkingInfoBuilder.setCcExecutionDynamicLibrariesInfo(
-        ccLinkingInfo.getCcExecutionDynamicLibrariesInfo());
+    ccLinkingInfoBuilder.setCcExecutionDynamicLibraries(
+        ccLinkingInfo.getCcExecutionDynamicLibraries());
     ccLinkingInfoBuilder.setCcRunfiles(new CcRunfiles(staticRunfiles, sharedRunfiles));
 
     return ccLinkingInfoBuilder.build();

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkingHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkingHelper.java
@@ -541,7 +541,7 @@ public LinkingInfo link(CcCompilationOutputs ccOutputs, CcCompilationContext ccC
 
     CcLinkingInfo.Builder ccLinkingInfoBuilder = CcLinkingInfo.Builder.create();
     ccLinkingInfoBuilder.setCcRunfiles(new CcRunfiles(cppStaticRunfiles, cppSharedRunfiles));
-    ccLinkingInfoBuilder.setCcExecutionDynamicLibrariesInfo(
+    ccLinkingInfoBuilder.setCcExecutionDynamicLibraries(
         collectExecutionDynamicLibraryArtifacts(ccLinkingOutputs.getExecutionDynamicLibraries()));
 
     CppConfiguration cppConfiguration = ruleContext.getFragment(CppConfiguration.class);
@@ -672,26 +672,24 @@ private NestedSet<LinkerInput> collectNativeCcLibraries(CcLinkingOutputs ccLinki
     return result.build();
   }
 
-  private CcExecutionDynamicLibrariesInfo collectExecutionDynamicLibraryArtifacts(
+  private CcExecutionDynamicLibraries collectExecutionDynamicLibraryArtifacts(
       List<LibraryToLink> executionDynamicLibraries) {
     Iterable<Artifact> artifacts = LinkerInputs.toLibraryArtifacts(executionDynamicLibraries);
     if (!Iterables.isEmpty(artifacts)) {
-      return new CcExecutionDynamicLibrariesInfo(
-          NestedSetBuilder.wrap(Order.STABLE_ORDER, artifacts));
+      return new CcExecutionDynamicLibraries(NestedSetBuilder.wrap(Order.STABLE_ORDER, artifacts));
     }
 
     NestedSetBuilder<Artifact> builder = NestedSetBuilder.stableOrder();
     for (CcLinkingInfo dep : AnalysisUtils.getProviders(deps, CcLinkingInfo.PROVIDER)) {
-      CcExecutionDynamicLibrariesInfo ccExecutionDynamicLibrariesInfo =
-          dep.getCcExecutionDynamicLibrariesInfo();
-      if (ccExecutionDynamicLibrariesInfo != null) {
-        builder.addTransitive(
-            ccExecutionDynamicLibrariesInfo.getExecutionDynamicLibraryArtifacts());
+      CcExecutionDynamicLibraries ccExecutionDynamicLibraries =
+          dep.getCcExecutionDynamicLibraries();
+      if (ccExecutionDynamicLibraries != null) {
+        builder.addTransitive(ccExecutionDynamicLibraries.getExecutionDynamicLibraryArtifacts());
       }
     }
     return builder.isEmpty()
-        ? CcExecutionDynamicLibrariesInfo.EMPTY
-        : new CcExecutionDynamicLibrariesInfo(builder.build());
+        ? CcExecutionDynamicLibraries.EMPTY
+        : new CcExecutionDynamicLibraries(builder.build());
   }
 
   /**

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkingInfo.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkingInfo.java
@@ -38,18 +38,18 @@ public final class CcLinkingInfo extends NativeInfo {
 
   private final CcLinkParamsStore ccLinkParamsStore;
   private final CcRunfiles ccRunfiles;
-  private final CcExecutionDynamicLibrariesInfo ccExecutionDynamicLibrariesInfo;
+  private final CcExecutionDynamicLibraries ccExecutionDynamicLibraries;
 
   @AutoCodec.Instantiator
   @VisibleForSerialization
   CcLinkingInfo(
       CcLinkParamsStore ccLinkParamsStore,
       CcRunfiles ccRunfiles,
-      CcExecutionDynamicLibrariesInfo ccExecutionDynamicLibrariesInfo) {
+      CcExecutionDynamicLibraries ccExecutionDynamicLibraries) {
     super(PROVIDER);
     this.ccLinkParamsStore = ccLinkParamsStore;
     this.ccRunfiles = ccRunfiles;
-    this.ccExecutionDynamicLibrariesInfo = ccExecutionDynamicLibrariesInfo;
+    this.ccExecutionDynamicLibraries = ccExecutionDynamicLibraries;
   }
 
   public CcLinkParamsStore getCcLinkParamsStore() {
@@ -60,15 +60,15 @@ public CcRunfiles getCcRunfiles() {
     return ccRunfiles;
   }
 
-  public CcExecutionDynamicLibrariesInfo getCcExecutionDynamicLibrariesInfo() {
-    return ccExecutionDynamicLibrariesInfo;
+  public CcExecutionDynamicLibraries getCcExecutionDynamicLibraries() {
+    return ccExecutionDynamicLibraries;
   }
 
   /** A Builder for {@link CcLinkingInfo}. */
   public static class Builder {
     CcLinkParamsStore ccLinkParamsStore;
     CcRunfiles ccRunfiles;
-    CcExecutionDynamicLibrariesInfo ccExecutionDynamicLibrariesInfo;
+    CcExecutionDynamicLibraries ccExecutionDynamicLibraries;
 
     public static CcLinkingInfo.Builder create() {
       return new CcLinkingInfo.Builder();
@@ -86,15 +86,15 @@ public Builder setCcRunfiles(CcRunfiles ccRunfiles) {
       return this;
     }
 
-    public Builder setCcExecutionDynamicLibrariesInfo(
-        CcExecutionDynamicLibrariesInfo ccExecutionDynamicLibrariesInfo) {
-      Preconditions.checkState(this.ccExecutionDynamicLibrariesInfo == null);
-      this.ccExecutionDynamicLibrariesInfo = ccExecutionDynamicLibrariesInfo;
+    public Builder setCcExecutionDynamicLibraries(
+        CcExecutionDynamicLibraries ccExecutionDynamicLibraries) {
+      Preconditions.checkState(this.ccExecutionDynamicLibraries == null);
+      this.ccExecutionDynamicLibraries = ccExecutionDynamicLibraries;
       return this;
     }
 
     public CcLinkingInfo build() {
-      return new CcLinkingInfo(ccLinkParamsStore, ccRunfiles, ccExecutionDynamicLibrariesInfo);
+      return new CcLinkingInfo(ccLinkParamsStore, ccRunfiles, ccExecutionDynamicLibraries);
     }
   }
 }
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java
@@ -120,7 +120,7 @@ public void testEmptyLibrary() throws Exception {
     assertThat(
             emptylib
                 .get(CcLinkingInfo.PROVIDER)
-                .getCcExecutionDynamicLibrariesInfo()
+                .getCcExecutionDynamicLibraries()
                 .getExecutionDynamicLibraryArtifacts()
                 .isEmpty())
         .isTrue();
@@ -233,7 +233,7 @@ public void testLinkStaticStatically() throws Exception {
     assertThat(
             statically
                 .get(CcLinkingInfo.PROVIDER)
-                .getCcExecutionDynamicLibrariesInfo()
+                .getCcExecutionDynamicLibraries()
                 .getExecutionDynamicLibraryArtifacts()
                 .isEmpty())
         .isTrue();

diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java
@@ -166,7 +166,7 @@ public void testFilesToBuild() throws Exception {
     assertThat(
             hello
                 .get(CcLinkingInfo.PROVIDER)
-                .getCcExecutionDynamicLibrariesInfo()
+                .getCcExecutionDynamicLibraries()
                 .getExecutionDynamicLibraryArtifacts())
         .containsExactly(implSharedObjectLink);
   }
@@ -231,7 +231,7 @@ public void testFilesToBuildWithInterfaceSharedObjects() throws Exception {
     assertThat(
             hello
                 .get(CcLinkingInfo.PROVIDER)
-                .getCcExecutionDynamicLibrariesInfo()
+                .getCcExecutionDynamicLibraries()
                 .getExecutionDynamicLibraryArtifacts())
         .containsExactly(implSharedObjectLink);
   }

diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/LibraryLinkingTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/LibraryLinkingTest.java
@@ -111,7 +111,7 @@ public boolean apply(Artifact artifact) {
         Iterables.getOnlyElement(
             ccLib
                 .get(CcLinkingInfo.PROVIDER)
-                .getCcExecutionDynamicLibrariesInfo()
+                .getCcExecutionDynamicLibraries()
                 .getExecutionDynamicLibraryArtifacts());
     // This artifact is generated by a SolibSymlinkAction, so we need to go back two levels.
     CppLinkAction solibLink =