Rename ExceptionCleanupBlock into TryExpr am: 45b50b75e5
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1901337
Change-Id: I9059d02cf516f9d4fe6e32286e6870f82bffa8ac
diff --git a/staticlibs/testutils/hostdevice/com/android/testutils/Cleanup.kt b/staticlibs/testutils/hostdevice/com/android/testutils/Cleanup.kt
index 0f7ec70..22b9b6c 100644
--- a/staticlibs/testutils/hostdevice/com/android/testutils/Cleanup.kt
+++ b/staticlibs/testutils/hostdevice/com/android/testutils/Cleanup.kt
@@ -70,11 +70,11 @@
// 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 @@
}
@CheckReturnValue
-fun <T> tryTest(block: () -> T) = ExceptionCleanupBlock(
+fun <T> tryTest(block: () -> T) = TryExpr(
try {
Result.success(block())
} catch (e: Exception) {