joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Rename ExceptionCleanupBlock into TryExpr

Browse source 
This is a lot more inline with standard compiling theory

Test: NetworkStaticLibTests
Change-Id: I32c8926cb08a30b4a87bc6867ce194483a7f0c3a
This commit is contained in:
Chalard Jean 2021-11-24 17:01:08 +09:00
commit 2918ada958
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
staticlibs/testutils/hostdevice/com/android/testutils/Cleanup.kt
View file

@ -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) {