C++: Migrate CcCompilationInfo to NativeInfo

The old TransitiveInfoProvider is deprecated. Providers used from Skylark
should use NativeInfo as specified in[]

RELNOTES:none
PiperOrigin-RevId: 186447814

5 files changed, 15 insertions, 15 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/rules/AliasTest.java b/src/test/java/com/google/devtools/build/lib/rules/AliasTest.java
index 2941a8019e..4784acaed6 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/AliasTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/AliasTest.java
@@ -41,7 +41,7 @@ public class AliasTest extends BuildViewTestCase {
         "alias(name='b', actual='a')");
 
     ConfiguredTarget b = getConfiguredTarget("//a:b");
-    assertThat(b.getProvider(CcCompilationInfo.class)).isNotNull();
+    assertThat(b.get(CcCompilationInfo.PROVIDER)).isNotNull();
   }
 
   @Test
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
index 48abcf6238..15dd847aae 100644
--- 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
@@ -249,7 +249,7 @@ public class CcCommonTest extends BuildViewTestCase {
             "cc_library(name = 'defineslib',",
             "           srcs = ['defines.cc'],",
             "           defines = ['FOO', 'BAR'])");
-    assertThat(isolatedDefines.getProvider(CcCompilationInfo.class).getDefines())
+    assertThat(isolatedDefines.get(CcCompilationInfo.PROVIDER).getDefines())
         .containsExactly("FOO", "BAR")
         .inOrder();
   }
@@ -415,7 +415,7 @@ public class CcCommonTest extends BuildViewTestCase {
     ConfiguredTarget foo = getConfiguredTarget("//bang:bang");
 
     String includesRoot = "bang/bang_includes";
-    assertThat(foo.getProvider(CcCompilationInfo.class).getSystemIncludeDirs())
+    assertThat(foo.get(CcCompilationInfo.PROVIDER).getSystemIncludeDirs())
         .containsAllOf(
             PathFragment.create(includesRoot),
             targetConfig.getGenfilesFragment().getRelative(includesRoot));
@@ -442,11 +442,11 @@ public class CcCommonTest extends BuildViewTestCase {
     String includesRoot = "bang/bang_includes";
     List<PathFragment> expected =
         new ImmutableList.Builder<PathFragment>()
-            .addAll(noIncludes.getProvider(CcCompilationInfo.class).getSystemIncludeDirs())
+            .addAll(noIncludes.get(CcCompilationInfo.PROVIDER).getSystemIncludeDirs())
             .add(PathFragment.create(includesRoot))
             .add(targetConfig.getGenfilesFragment().getRelative(includesRoot))
             .build();
-    assertThat(foo.getProvider(CcCompilationInfo.class).getSystemIncludeDirs())
+    assertThat(foo.get(CcCompilationInfo.PROVIDER).getSystemIncludeDirs())
         .containsExactlyElementsIn(expected);
   }
 
@@ -855,7 +855,7 @@ public class CcCommonTest extends BuildViewTestCase {
         "cc_library(name='a', hdrs=['v1/b/c.h'], strip_include_prefix='v1', include_prefix='lib')");
 
     ConfiguredTarget lib = getConfiguredTarget("//third_party/a");
-    CcCompilationInfo ccCompilationInfo = lib.getProvider(CcCompilationInfo.class);
+    CcCompilationInfo ccCompilationInfo = lib.get(CcCompilationInfo.PROVIDER);
     assertThat(ActionsTestUtil.prettyArtifactNames(ccCompilationInfo.getDeclaredIncludeSrcs()))
         .containsExactly("third_party/a/_virtual_includes/a/lib/b/c.h");
     assertThat(ccCompilationInfo.getIncludeDirs())
@@ -895,9 +895,9 @@ public class CcCommonTest extends BuildViewTestCase {
         "cc_library(name='absolute', hdrs=['v1/b.h'], strip_include_prefix='/third_party')");
 
     CcCompilationInfo relative =
-        getConfiguredTarget("//third_party/a:relative").getProvider(CcCompilationInfo.class);
+        getConfiguredTarget("//third_party/a:relative").get(CcCompilationInfo.PROVIDER);
     CcCompilationInfo absolute =
-        getConfiguredTarget("//third_party/a:absolute").getProvider(CcCompilationInfo.class);
+        getConfiguredTarget("//third_party/a:absolute").get(CcCompilationInfo.PROVIDER);
 
     assertThat(ActionsTestUtil.prettyArtifactNames(relative.getDeclaredIncludeSrcs()))
         .containsExactly("third_party/a/_virtual_includes/relative/b.h");
@@ -925,7 +925,7 @@ public class CcCommonTest extends BuildViewTestCase {
         "cc_library(name='a', hdrs=['a.h'], include_prefix='third_party')");
 
     CcCompilationInfo ccCompilationInfo =
-        getConfiguredTarget("//third_party:a").getProvider(CcCompilationInfo.class);
+        getConfiguredTarget("//third_party:a").get(CcCompilationInfo.PROVIDER);
     assertThat(ActionsTestUtil.prettyArtifactNames(ccCompilationInfo.getDeclaredIncludeSrcs()))
         .doesNotContain("third_party/_virtual_includes/a/third_party/a.h");
   }
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcImportConfiguredTargetTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcImportConfiguredTargetTest.java
index 864475d1f4..8581414c4b 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcImportConfiguredTargetTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcImportConfiguredTargetTest.java
@@ -283,7 +283,7 @@ public class CcImportConfiguredTargetTest extends BuildViewTestCase {
                 "a",
                 "foo",
                 "cc_import(name = 'foo', static_library = 'libfoo.a', hdrs = ['foo.h'])")
-            .getProvider(CcCompilationInfo.class)
+            .get(CcCompilationInfo.PROVIDER)
             .getDeclaredIncludeSrcs();
     assertThat(artifactsToStrings(headers)).containsExactly("src a/foo.h");
   }
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
index 0504464bc7..5a7890c5ad 100644
--- 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
@@ -91,13 +91,13 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase {
 
   private CppModuleMapAction getCppModuleMapAction(String label) throws Exception {
     ConfiguredTarget target = getConfiguredTarget(label);
-    CppModuleMap cppModuleMap = target.getProvider(CcCompilationInfo.class).getCppModuleMap();
+    CppModuleMap cppModuleMap = target.get(CcCompilationInfo.PROVIDER).getCppModuleMap();
     return (CppModuleMapAction) getGeneratingAction(cppModuleMap.getArtifact());
   }
 
   private void assertNoCppModuleMapAction(String label) throws Exception {
     ConfiguredTarget target = getConfiguredTarget(label);
-    assertThat(target.getProvider(CcCompilationInfo.class).getCppModuleMap()).isNull();
+    assertThat(target.get(CcCompilationInfo.PROVIDER).getCppModuleMap()).isNull();
   }
 
   @Test
@@ -105,7 +105,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase {
     ConfiguredTarget l = scratchConfiguredTarget("a", "l",
         "cc_library(name='l', srcs=['l.cc'], defines=['V=$(FOO)'], toolchains=[':v'])",
         "make_variable_tester(name='v', variables={'FOO': 'BAR'})");
-    assertThat(l.getProvider(CcCompilationInfo.class).getDefines()).contains("V=BAR");
+    assertThat(l.get(CcCompilationInfo.PROVIDER).getDefines()).contains("V=BAR");
   }
 
   @Test
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibraryTest.java
index 5b0ae77f04..d09454f013 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibraryTest.java
@@ -107,7 +107,7 @@ public class CcProtoLibraryTest extends BuildViewTestCase {
         "proto_library(name = 'foo_proto', srcs = ['foo.proto'])");
 
     CcCompilationInfo ccCompilationInfo =
-        getConfiguredTarget("//x:foo_cc_proto").getProvider(CcCompilationInfo.class);
+        getConfiguredTarget("//x:foo_cc_proto").get(CcCompilationInfo.PROVIDER);
     assertThat(prettyArtifactNames(ccCompilationInfo.getDeclaredIncludeSrcs()))
         .containsExactly("x/foo.pb.h");
   }
@@ -121,7 +121,7 @@ public class CcProtoLibraryTest extends BuildViewTestCase {
         "proto_library(name = 'bar_proto', srcs = ['bar.proto'])");
 
     CcCompilationInfo ccCompilationInfo =
-        getConfiguredTarget("//x:foo_cc_proto").getProvider(CcCompilationInfo.class);
+        getConfiguredTarget("//x:foo_cc_proto").get(CcCompilationInfo.PROVIDER);
     assertThat(prettyArtifactNames(ccCompilationInfo.getDeclaredIncludeSrcs()))
         .containsExactly("x/foo.pb.h", "x/bar.pb.h");
   }