From e35efe7d72104e986ecd515d2194290e0789baf4 Mon Sep 17 00:00:00 2001 From: Kurt Alfred Kluever Date: Tue, 21 May 2024 10:43:42 -0700 Subject: [PATCH] Temporarily remove `@InlineMe` from `Modules.combine(Module)`. PiperOrigin-RevId: 635857202 --- core/src/com/google/inject/util/Modules.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/com/google/inject/util/Modules.java b/core/src/com/google/inject/util/Modules.java index 1d369f34bd..e6f4a53b4d 100644 --- a/core/src/com/google/inject/util/Modules.java +++ b/core/src/com/google/inject/util/Modules.java @@ -23,6 +23,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.errorprone.annotations.CheckReturnValue; +import com.google.errorprone.annotations.InlineMe; import com.google.inject.AbstractModule; import com.google.inject.Binder; import com.google.inject.Binding; @@ -125,7 +126,7 @@ public static Module combine(Module... modules) { /** * @deprecated there's no need to "combine" one module; just install it directly. */ - // TODO(b/341757497): re-enable this inlining: @InlineMe(replacement = "module") + @InlineMe(replacement = "module") @Deprecated public static Module combine(Module module) { return module;