From 0ec4145f1e70581f4edc0ea4c719269ce3e35f70 Mon Sep 17 00:00:00 2001
From: cpovirk <cpovirk@google.com>
Date: Tue, 23 Jun 2026 13:59:19 -0700
Subject: [PATCH] Avoid writing "`Foo.Bar`" inside a `Foo` in some cases.

RELNOTES=n/a
PiperOrigin-RevId: 936875304
---
 .../truth/extensions/proto/MapWithProtoValuesSubject.java      | 3 +--
 .../truth/extensions/proto/MultimapWithProtoValuesSubject.java | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/extensions/proto/src/main/java/com/google/common/truth/extensions/proto/MapWithProtoValuesSubject.java b/extensions/proto/src/main/java/com/google/common/truth/extensions/proto/MapWithProtoValuesSubject.java
index 821cbecd7..960ed6f77 100644
--- a/extensions/proto/src/main/java/com/google/common/truth/extensions/proto/MapWithProtoValuesSubject.java
+++ b/extensions/proto/src/main/java/com/google/common/truth/extensions/proto/MapWithProtoValuesSubject.java
@@ -629,8 +629,7 @@ public MapWithProtoValuesFluentAssertion<M> unpackingAnyUsingForValues(
   // UsingCorrespondence Methods
   //////////////////////////////////////////////////////////////////////////////////////////////////
 
-  private MapSubject.UsingCorrespondence<M, M> usingCorrespondence(
-      Iterable<? extends M> expectedValues) {
+  private UsingCorrespondence<M, M> usingCorrespondence(Iterable<? extends M> expectedValues) {
     return comparingValuesUsing(
         config
             .withExpectedMessages(expectedValues)
diff --git a/extensions/proto/src/main/java/com/google/common/truth/extensions/proto/MultimapWithProtoValuesSubject.java b/extensions/proto/src/main/java/com/google/common/truth/extensions/proto/MultimapWithProtoValuesSubject.java
index bb22ffc0e..08175770a 100644
--- a/extensions/proto/src/main/java/com/google/common/truth/extensions/proto/MultimapWithProtoValuesSubject.java
+++ b/extensions/proto/src/main/java/com/google/common/truth/extensions/proto/MultimapWithProtoValuesSubject.java
@@ -658,8 +658,7 @@ public MultimapWithProtoValuesFluentAssertion<M> unpackingAnyUsingForValues(
   // UsingCorrespondence Methods
   //////////////////////////////////////////////////////////////////////////////////////////////////
 
-  private MultimapSubject.UsingCorrespondence<M, M> usingCorrespondence(
-      Iterable<? extends M> expectedValues) {
+  private UsingCorrespondence<M, M> usingCorrespondence(Iterable<? extends M> expectedValues) {
     return comparingValuesUsing(
         config
             .withExpectedMessages(expectedValues)