summary refs log tree commit diff stats
path: root/tests/stdlib/tmarshal.nim
diff options
context:
space:
mode:
authorJonathan Edwards <apense+git@gmail.com>2015-03-11 16:26:10 -0400
committerJonathan Edwards <apense+git@gmail.com>2015-03-11 16:26:10 -0400
commit50ed39fd664dc498e054a9776437e8e94dc1843f (patch)
treeb904111b87218069da572c8cd885891613b4ea6e /tests/stdlib/tmarshal.nim
parent2f7d248090f0ad94826c2f80d6f9d9d20467720e (diff)
parent6dbd41e8751b43d76e6cc74b898d0134d592a2c0 (diff)
downloadNim-50ed39fd664dc498e054a9776437e8e94dc1843f.tar.gz
Merge remote-tracking branch 'upstream/devel' into devel
Diffstat (limited to 'tests/stdlib/tmarshal.nim')
-rw-r--r--tests/stdlib/tmarshal.nim12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/stdlib/tmarshal.nim b/tests/stdlib/tmarshal.nim
index 1b83aab53..a778d2f77 100644
--- a/tests/stdlib/tmarshal.nim
+++ b/tests/stdlib/tmarshal.nim
@@ -6,11 +6,11 @@ import marshal
 
 template testit(x: expr) = discard $$to[type(x)]($$x)
 
-var x: array[0..4, array[0..4, string]] = [

-  ["test", "1", "2", "3", "4"], ["test", "1", "2", "3", "4"], 

-  ["test", "1", "2", "3", "4"], ["test", "1", "2", "3", "4"], 

-  ["test", "1", "2", "3", "4"]]

-testit(x)

+var x: array[0..4, array[0..4, string]] = [
+  ["test", "1", "2", "3", "4"], ["test", "1", "2", "3", "4"],
+  ["test", "1", "2", "3", "4"], ["test", "1", "2", "3", "4"],
+  ["test", "1", "2", "3", "4"]]
+testit(x)
 var test2: tuple[name: string, s: int] = ("tuple test", 56)
 testit(test2)
 
@@ -24,7 +24,7 @@ type
     of blah:
       help: string
     else:
-      nil
+      discard
       
   PNode = ref TNode
   TNode = object