From 2918ada95870dcdd7acdb42520929880c89921df Mon Sep 17 00:00:00 2001
From: Chalard Jean <jchalard@google.com>
Date: Wed, 24 Nov 2021 17:01:08 +0900
Subject: [PATCH] Rename ExceptionCleanupBlock into TryExpr

This is a lot more inline with standard compiling theory

Test: NetworkStaticLibTests
Change-Id: I32c8926cb08a30b4a87bc6867ce194483a7f0c3a
---
 .../testutils/hostdevice/com/android/testutils/Cleanup.kt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/staticlibs/testutils/hostdevice/com/android/testutils/Cleanup.kt b/staticlibs/testutils/hostdevice/com/android/testutils/Cleanup.kt
index 0f7ec70f89..22b9b6c63d 100644
--- a/staticlibs/testutils/hostdevice/com/android/testutils/Cleanup.kt
+++ b/staticlibs/testutils/hostdevice/com/android/testutils/Cleanup.kt
@@ -70,11 +70,11 @@ import javax.annotation.CheckReturnValue
 // sc-mainline-prod has an older kotlin that doesn't know about value classes. TODO : Change this
 // to "value class" when aosp no longer merges into sc-mainline-prod.
 @Suppress("INLINE_CLASS_DEPRECATED")
-inline class ExceptionCleanupBlock<T>(val result: Result<T>) {
-    inline infix fun <reified E : Throwable> catch(block: (E) -> T): ExceptionCleanupBlock<T> {
+inline class TryExpr<T>(val result: Result<T>) {
+    inline infix fun <reified E : Throwable> catch(block: (E) -> T): TryExpr<T> {
         val originalException = result.exceptionOrNull()
         if (originalException !is E) return this
-        return ExceptionCleanupBlock(try {
+        return TryExpr(try {
             Result.success(block(originalException))
         } catch (e: Exception) {
             Result.failure(e)
@@ -98,7 +98,7 @@ inline class ExceptionCleanupBlock<T>(val result: Result<T>) {
 }
 
 @CheckReturnValue
-fun <T> tryTest(block: () -> T) = ExceptionCleanupBlock(
+fun <T> tryTest(block: () -> T) = TryExpr(
         try {
             Result.success(block())
         } catch (e: Exception) {