Fixme annotations cleanup. (#1865)

This commit is contained in:
Nikolay Igotti
2018-08-11 20:50:36 +03:00
committed by GitHub
parent bcbcaa5d7c
commit 8c975e5873
2 changed files with 9 additions and 23 deletions
+7 -18
View File
@@ -24,15 +24,15 @@ import kotlin.reflect.KClass
* TODO: changing symbol name breaks the binary compatibility,
* so it should probably be allowed on `internal` and `private` functions only.
*/
//@Target(AnnotationTarget.FUNCTION)
//@Retention(AnnotationRetention.SOURCE)
@Target(AnnotationTarget.FUNCTION)
// @Retention(AnnotationRetention.SOURCE)
annotation class SymbolName(val name: String)
/**
* Exports the TypeInfo of this class by given name to use it from runtime.
*/
//@Target(AnnotationTarget.CLASS)
//@Retention(AnnotationRetention.SOURCE)
@Target(AnnotationTarget.CLASS)
@Retention(AnnotationRetention.SOURCE)
annotation class ExportTypeInfo(val name: String)
/**
@@ -71,22 +71,11 @@ public annotation class FixmeReflection
*/
public annotation class FixmeConcurrency
/**
* Need to be fixed because of header/impl notation
*/
public annotation class FixmeMultiplatform
/**
* Need to be fixed because of random support.
*/
public annotation class FixmeRandom
/**
* Escape analysis annotations.
*/
public annotation class Escapes(val who: Int)
public annotation class PointsTo(vararg val onWhom: Int)
internal annotation class Escapes(val who: Int)
internal annotation class PointsTo(vararg val onWhom: Int)
/**
* Top level variable or object is thread local, and so could be mutable.
@@ -96,4 +85,4 @@ public annotation class PointsTo(vararg val onWhom: Int)
*/
@Target(AnnotationTarget.FIELD, AnnotationTarget.CLASS)
@Retention(AnnotationRetention.BINARY)
annotation class ThreadLocal
public annotation class ThreadLocal
@@ -21,7 +21,6 @@
package kotlin.test
import konan.FixmeMultiplatform
import kotlin.internal.InlineOnly
import kotlin.internal.OnlyInputTypes
import kotlin.reflect.KClass
@@ -137,15 +136,13 @@ fun <T : Throwable> assertFailsWith(exceptionClass: KClass<T>, block: () -> Unit
* Comments out a block of test code until it is implemented while keeping a link to the code
* to implement in your unit test output
*/
@FixmeMultiplatform
@Suppress("UNUSED_PARAMETER")
/*header */ inline fun todo(block: () -> Unit) {
inline fun todo(block: () -> Unit) {
println("TODO")
}
/** Asserts that a [block] fails with a specific exception of type [exceptionClass] being thrown. */
@FixmeMultiplatform
/* header */ fun <T : Throwable> assertFailsWith(exceptionClass: KClass<T>, message: String?, block: () -> Unit): T {
fun <T : Throwable> assertFailsWith(exceptionClass: KClass<T>, message: String?, block: () -> Unit): T {
try {
block()
} catch (e: Throwable) {