summary refs log tree commit diff stats
path: root/tests/generics
diff options
context:
space:
mode:
authorDaniil Yarancev <21169548+Yardanico@users.noreply.github.com>2018-01-07 21:02:00 +0300
committerGitHub <noreply@github.com>2018-01-07 21:02:00 +0300
commitfb44c522e6173528efa8035ecc459c84887d0167 (patch)
treea2f5e98606be265981a5f72748896967033e23d7 /tests/generics
parentccf99fa5ce4fe992fb80dc89271faa51456c3fa5 (diff)
parente23ea64c41e101d4e1d933f0b015f51cc6c2f7de (diff)
downloadNim-fb44c522e6173528efa8035ecc459c84887d0167.tar.gz
Merge pull request #1 from nim-lang/devel
upstream
Diffstat (limited to 'tests/generics')
-rw-r--r--tests/generics/toverloading_typedesc.nim1
-rw-r--r--tests/generics/treentranttypes.nim4
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/generics/toverloading_typedesc.nim b/tests/generics/toverloading_typedesc.nim
index 5882640f2..94f4d860d 100644
--- a/tests/generics/toverloading_typedesc.nim
+++ b/tests/generics/toverloading_typedesc.nim
@@ -1,5 +1,6 @@
 discard """
   exitcode: 0
+  disabled: '''true'''
 """
 import moverloading_typedesc
 import tables
diff --git a/tests/generics/treentranttypes.nim b/tests/generics/treentranttypes.nim
index 9b4774e9b..2ef049ce2 100644
--- a/tests/generics/treentranttypes.nim
+++ b/tests/generics/treentranttypes.nim
@@ -1,6 +1,6 @@
 discard """
 output: '''
-(Field0: 10, Field1: (Field0: test, Field1: 1.2))
+(Field0: 10, Field1: (Field0: "test", Field1: 1.2))
 3x3 Matrix [[0.0, 2.0, 3.0], [2.0, 0.0, 5.0], [2.0, 0.0, 5.0]]
 
 2x3 Matrix [[0.0, 2.0, 3.0], [2.0, 0.0, 5.0]]
@@ -43,7 +43,7 @@ type
 
   Matrix*[M: static[int]; N: static[int]; T] =
     Vector[M, Vector[N, T]]
-  
+
 proc arrayTest =
   # every kind of square matrix works just fine
   let mat_good: Matrix[3, 3, float] = [[0.0, 2.0, 3.0],