From 4ad180914c5509dc9e0054862509223def369082 Mon Sep 17 00:00:00 2001
From: Googler <brandjon@google.com>
Date: Fri, 5 Jan 2024 11:20:41 -0800
Subject: [PATCH] Remove package name from error message

This makes the affected error message more symmetric with other related errors that do not include the package name. The package name should be added somewhere higher up in the handling logic anyway.

Work toward #19922. (Drive-by fix)

PiperOrigin-RevId: 596041531
Change-Id: Ibfc3731f941de3a5020d751d46ac33f77e7d2019
---
 .../com/google/devtools/build/lib/packages/Package.java     | 4 ----
 .../devtools/build/lib/packages/ExportsFilesTest.java       | 2 +-
 .../devtools/build/lib/packages/PackageFactoryTest.java     | 6 ++----
 .../build/lib/starlark/StarlarkRuleClassFunctionsTest.java  | 4 ++--
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/google/devtools/build/lib/packages/Package.java b/src/main/java/com/google/devtools/build/lib/packages/Package.java
index c29c09e99230ad..e22c792c062779 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/Package.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/Package.java
@@ -1863,10 +1863,6 @@ private static NameConflictException nameConflict(Target added, Target existing)
       String subject = String.format("%s '%s'", added.getTargetKind(), added.getName());
       if (added instanceof OutputFile) {
         subject += " in rule '" + ((OutputFile) added).getGeneratingRule().getName() + "'";
-      } else {
-        // TODO(#19922): This case is unnecessary. The package name context information should be
-        // added elsewhere.
-        subject += " in package '" + added.getLabel().getPackageName() + "'";
       }
 
       String object =
diff --git a/src/test/java/com/google/devtools/build/lib/packages/ExportsFilesTest.java b/src/test/java/com/google/devtools/build/lib/packages/ExportsFilesTest.java
index fee8006a28ecfc..30ab6a62cb0619 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/ExportsFilesTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/ExportsFilesTest.java
@@ -77,6 +77,6 @@ public void testExportsFilesAndRuleNameConflict() throws Exception {
         "exports_files(['foo'])",
         "genrule(name = 'foo', srcs = ['bar'], outs = [], cmd = '/bin/true')");
     assertThat(getTarget("//pkg2:foo")).isInstanceOf(InputFile.class);
-    assertContainsEvent("rule 'foo' in package 'pkg2' conflicts with existing source file");
+    assertContainsEvent("rule 'foo' conflicts with existing source file");
   }
 }
diff --git a/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java b/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java
index 5fedc206c8649b..e9c531d8f2abe4 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java
@@ -245,8 +245,7 @@ public void testDuplicateRuleName() throws Exception {
         "x = 1//0"); // not reached
     Package pkg = loadPackage("duplicaterulename");
     assertContainsEvent(
-        "cc_library rule 'spellcheck_proto' in package 'duplicaterulename' conflicts with"
-            + " existing proto_library rule");
+        "cc_library rule 'spellcheck_proto' conflicts with" + " existing proto_library rule");
     assertDoesNotContainEvent("division by zero");
     assertThat(pkg.containsErrors()).isTrue();
   }
@@ -325,8 +324,7 @@ public void testDuplicateRuleIsNotAddedToPackage() throws Exception {
         "cc_library(name = 'dup_proto',",
         "           srcs = ['dup.pb.cc', 'dup.pb.h'])");
     Package pkg = loadPackage("dup");
-    assertContainsEvent(
-        "cc_library rule 'dup_proto' in package 'dup' conflicts with existing proto_library rule");
+    assertContainsEvent("cc_library rule 'dup_proto' conflicts with existing proto_library rule");
     assertThat(pkg.containsErrors()).isTrue();
 
     Rule dupProto = pkg.getRule("dup_proto");
diff --git a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleClassFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleClassFunctionsTest.java
index 4b7451ba222b66..5289051bc3a02b 100644
--- a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleClassFunctionsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleClassFunctionsTest.java
@@ -4592,8 +4592,8 @@ public void testAnalysisTestDuplicateName_samePackage() throws Exception {
     getConfiguredTarget("//p:my_test_target");
 
     ev.assertContainsError(
-        "Error in analysis_test: my_test_target_test rule 'my_test_target' in package 'p' conflicts"
-            + " with existing my_test_target_test rule");
+        "Error in analysis_test: my_test_target_test rule 'my_test_target' conflicts with existing"
+            + " my_test_target_test rule");
   }
 
   // Regression test for b/291752414 (Digest for Starlark-defined rules is wrong for analysis_test).