From 7a16981520655655a0686e7ae0a504f46e2d06fe Mon Sep 17 00:00:00 2001
From: Danil Yarantsev <tiberiumk12@gmail.com>
Date: Thu, 25 Jun 2020 03:45:16 +0300
Subject: [PATCH 1/5] Fix #7174

---
 tests/misc/tints.nim | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/misc/tints.nim b/tests/misc/tints.nim
index fa3eb42cba23..3a601fa30d3f 100644
--- a/tests/misc/tints.nim
+++ b/tests/misc/tints.nim
@@ -77,5 +77,9 @@ block: # Casts to uint
 
   testCast(-5'i32, uint8, 251'u8)
 
+#7174
+let c = 1'u
+let val = c > 0
+doAssert val 
 
 echo("Success") #OUT Success

From 8ca025bc9242a12bfa18a2e22d9ad5aba3318dae Mon Sep 17 00:00:00 2001
From: Danil Yarantsev <tiberiumk12@gmail.com>
Date: Thu, 25 Jun 2020 03:57:44 +0300
Subject: [PATCH 2/5] Fix #12398

---
 tests/metatype/ttypedesc1.nim | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/metatype/ttypedesc1.nim b/tests/metatype/ttypedesc1.nim
index 837c8eccca7f..4d673651ca38 100644
--- a/tests/metatype/ttypedesc1.nim
+++ b/tests/metatype/ttypedesc1.nim
@@ -60,3 +60,9 @@ reject:
 reject:
   foo seq[int], ss
 
+# t12398
+reject:
+  let xs = [int, float, string]
+
+reject:
+  let data = @[int, typedesc]

From a4d6c0cc4dbac77dda71aee057a602a6e0604b2f Mon Sep 17 00:00:00 2001
From: Danil Yarantsev <tiberiumk12@gmail.com>
Date: Thu, 25 Jun 2020 04:00:38 +0300
Subject: [PATCH 3/5] Fix #9313

---
 tests/async/tasync_misc.nim | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/async/tasync_misc.nim b/tests/async/tasync_misc.nim
index 29e6faa72737..5496cb3d555d 100644
--- a/tests/async/tasync_misc.nim
+++ b/tests/async/tasync_misc.nim
@@ -74,3 +74,10 @@ block: # issue #13899
       result = true
   doAssert waitFor testFooSucceed()
   doAssert waitFor testFooFails()
+
+block: # 9313
+  doAssert compiles(block:
+    proc a() {.async.} =
+      echo "Hi"
+      quit(0)
+  )

From 0c661307cfce4f2b7f183897669027719c1ba24d Mon Sep 17 00:00:00 2001
From: Danil Yarantsev <tiberiumk12@gmail.com>
Date: Thu, 25 Jun 2020 04:07:44 +0300
Subject: [PATCH 4/5] Fix #9458

---
 tests/generics/tgenerics_issues.nim | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/tests/generics/tgenerics_issues.nim b/tests/generics/tgenerics_issues.nim
index af71a89380f0..ef479b7881e9 100644
--- a/tests/generics/tgenerics_issues.nim
+++ b/tests/generics/tgenerics_issues.nim
@@ -762,3 +762,21 @@ block t3717:
 
   var f: Foo[Foo[int]]
   discard foo(f)
+
+
+
+block t9458:
+  type
+    Option[T] = object
+      val: T
+      has: bool
+    
+    Bar = object
+
+  proc none(T: typedesc): Option[T] =
+    discard
+
+  proc foo[T](self: T; x: Option[Bar] = Bar.none) = 
+    discard
+
+  foo(1)

From 4cdce65b2c0dc5652f19694cb44e553b9e6ae00f Mon Sep 17 00:00:00 2001
From: Danil Yarantsev <tiberiumk12@gmail.com>
Date: Thu, 25 Jun 2020 04:43:10 +0300
Subject: [PATCH 5/5] Unify issue comments

---
 tests/async/tasync_misc.nim         | 2 +-
 tests/generics/tgenerics_issues.nim | 2 +-
 tests/metatype/ttypedesc1.nim       | 2 +-
 tests/misc/tints.nim                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/async/tasync_misc.nim b/tests/async/tasync_misc.nim
index 5496cb3d555d..ec1418e8c35d 100644
--- a/tests/async/tasync_misc.nim
+++ b/tests/async/tasync_misc.nim
@@ -75,7 +75,7 @@ block: # issue #13899
   doAssert waitFor testFooSucceed()
   doAssert waitFor testFooFails()
 
-block: # 9313
+block: # issue #9313
   doAssert compiles(block:
     proc a() {.async.} =
       echo "Hi"
diff --git a/tests/generics/tgenerics_issues.nim b/tests/generics/tgenerics_issues.nim
index ef479b7881e9..54360f178d4b 100644
--- a/tests/generics/tgenerics_issues.nim
+++ b/tests/generics/tgenerics_issues.nim
@@ -765,7 +765,7 @@ block t3717:
 
 
 
-block t9458:
+block: # issue #9458
   type
     Option[T] = object
       val: T
diff --git a/tests/metatype/ttypedesc1.nim b/tests/metatype/ttypedesc1.nim
index 4d673651ca38..549dbc62af1d 100644
--- a/tests/metatype/ttypedesc1.nim
+++ b/tests/metatype/ttypedesc1.nim
@@ -60,7 +60,7 @@ reject:
 reject:
   foo seq[int], ss
 
-# t12398
+# issue #12398
 reject:
   let xs = [int, float, string]
 
diff --git a/tests/misc/tints.nim b/tests/misc/tints.nim
index 3a601fa30d3f..d24cbd4aca28 100644
--- a/tests/misc/tints.nim
+++ b/tests/misc/tints.nim
@@ -77,7 +77,7 @@ block: # Casts to uint
 
   testCast(-5'i32, uint8, 251'u8)
 
-#7174
+# issue #7174
 let c = 1'u
 let val = c > 0
 doAssert val