stylecheck: nnkArglist -> nnkArgList (#127)

* stylecheck: nnkArglist -> nnkArgList * --stylecheck:error iff >= 1.6.0
status-im · Jul 18, 2022 · f173efc · f173efc
1 parent 9a3130e
commit f173efc
Show file tree

Hide file tree

Showing 25 changed files with 148 additions and 12 deletions.
diff --git a/stew.nimble b/stew.nimble
@@ -12,9 +12,19 @@ requires "nim >= 1.2.0",
 
 ### Helper functions
 proc test(args, path: string) =
+  # nnkArglist was changed to nnkArgList, so can't always use --styleCheck:error
+  # https://github.com/nim-lang/Nim/pull/17529
+  # https://github.com/nim-lang/Nim/pull/19822
+  let styleCheckStyle =
+    if (NimMajor, NimMinor) < (1, 6):
+      "hint"
+    else:
+      "error"
+
   # Compilation language is controlled by TEST_LANG
-  exec "nim " & getEnv("TEST_LANG", "c") & " " & getEnv("NIMFLAGS") & " " & args &
-    " -r --hints:off --skipParentCfg --styleCheck:usages --styleCheck:error " & path
+  exec "nim " & getEnv("TEST_LANG", "c") & " " & getEnv("NIMFLAGS") & " " &
+    args & " -r --hints:off --skipParentCfg --styleCheck:usages --styleCheck:" &
+    styleCheckStyle & " " & path
 
 task test, "Run all tests":
   test "--threads:off", "tests/all_tests"

diff --git a/stew/shims/macros.nim b/stew/shims/macros.nim
@@ -412,7 +412,7 @@ macro unpackArgs*(callee: untyped, args: untyped): untyped =
   for arg in args:
     let arg = if arg.kind == nnkHiddenStdConv: arg[1]
               else: arg
-    if arg.kind == nnkArglist:
+    if arg.kind == nnkArgList:
       for subarg in arg:
         result.add subarg
     else:

diff --git a/tests/all_tests.nim b/tests/all_tests.nim
@@ -1,5 +1,5 @@
 # stew
-# Copyright 2018-2019 Status Research & Development GmbH
+# Copyright 2018-2022 Status Research & Development GmbH
 # Licensed under either of
 #
 #  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)

diff --git a/tests/ranges/all.nim b/tests/ranges/all.nim
@@ -1,2 +1,4 @@
+{.used.}
+
 import
   ttypedranges, tstackarrays, tbitranges
diff --git a/tests/ranges/tbitranges.nim b/tests/ranges/tbitranges.nim
@@ -1,3 +1,11 @@
+# Copyright (c) 2019-2022 Status Research & Development GmbH
+# Licensed and distributed under either of
+#   * MIT license: http://opensource.org/licenses/MIT
+#   * Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
+# at your option. This file may not be copied, modified, or distributed except according to those terms.
+
+{.used.}
+
 import
   random, unittest2,
   ../../stew/ranges/bitranges, ../../stew/bitseqs

diff --git a/tests/ranges/tstackarrays.nim b/tests/ranges/tstackarrays.nim
@@ -1,3 +1,11 @@
+# Copyright (c) 2019-2022 Status Research & Development GmbH
+# Licensed and distributed under either of
+#   * MIT license: http://opensource.org/licenses/MIT
+#   * Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
+# at your option. This file may not be copied, modified, or distributed except according to those terms.
+
+{.used.}
+
 import
   unittest2, math,
   ../../stew/ptrops,

diff --git a/tests/ranges/ttypedranges.nim b/tests/ranges/ttypedranges.nim
@@ -1,3 +1,11 @@
+# Copyright (c) 2019-2022 Status Research & Development GmbH
+# Licensed and distributed under either of
+#   * MIT license: http://opensource.org/licenses/MIT
+#   * Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
+# at your option. This file may not be copied, modified, or distributed except according to those terms.
+
+{.used.}
+
 import
   unittest2, sets,
   ../../stew/ranges/[typedranges, ptr_arith]

diff --git a/tests/test_assign2.nim b/tests/test_assign2.nim
@@ -1,3 +1,11 @@
+# Copyright (c) 2020-2022 Status Research & Development GmbH
+# Licensed and distributed under either of
+#   * MIT license: http://opensource.org/licenses/MIT
+#   * Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
+# at your option. This file may not be copied, modified, or distributed except according to those terms.
+
+{.used.}
+
 import
   unittest2,
   ../stew/assign2

diff --git a/tests/test_bitops2.nim b/tests/test_bitops2.nim
@@ -1,3 +1,11 @@
+# Copyright (c) 2019-2022 Status Research & Development GmbH
+# Licensed and distributed under either of
+#   * MIT license: http://opensource.org/licenses/MIT
+#   * Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
+# at your option. This file may not be copied, modified, or distributed except according to those terms.
+
+{.used.}
+
 import unittest2
 
 import ../stew/bitops2

diff --git a/tests/test_bitseqs.nim b/tests/test_bitseqs.nim
@@ -1,3 +1,11 @@
+# Copyright (c) 2019-2022 Status Research & Development GmbH
+# Licensed and distributed under either of
+#   * MIT license: http://opensource.org/licenses/MIT
+#   * Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
+# at your option. This file may not be copied, modified, or distributed except according to those terms.
+
+{.used.}
+
 import
   unittest2, strformat,
   ../stew/[bitseqs]

diff --git a/tests/test_byteutils.nim b/tests/test_byteutils.nim
@@ -1,10 +1,12 @@
 # byteutils
-# Copyright (c) 2018 Status Research & Development GmbH
+# Copyright (c) 2018-2022 Status Research & Development GmbH
 # Licensed and distributed under either of
 #   * MIT license (license terms in the root directory or at http://opensource.org/licenses/MIT).
 #   * Apache v2 license (license terms in the root directory or at http://www.apache.org/licenses/LICENSE-2.0).
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
+{.used.}
+
 import
   unittest2,
   ../stew/byteutils

diff --git a/tests/test_ctops.nim b/tests/test_ctops.nim
@@ -1,3 +1,11 @@
+# Copyright (c) 2020-2022 Status Research & Development GmbH
+# Licensed and distributed under either of
+#   * MIT license: http://opensource.org/licenses/MIT
+#   * Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
+# at your option. This file may not be copied, modified, or distributed except according to those terms.
+
+{.used.}
+
 import unittest2
 import ../stew/ctops
 

diff --git a/tests/test_endians2.nim b/tests/test_endians2.nim
@@ -1,3 +1,11 @@
+# Copyright (c) 2019-2022 Status Research & Development GmbH
+# Licensed and distributed under either of
+#   * MIT license: http://opensource.org/licenses/MIT
+#   * Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
+# at your option. This file may not be copied, modified, or distributed except according to those terms.
+
+{.used.}
+
 import unittest2
 
 import ../stew/endians2

diff --git a/tests/test_interval_set.nim b/tests/test_interval_set.nim
@@ -1,6 +1,6 @@
 # Nimbus - Types, data structures and shared utilities used in network sync
 #
-# Copyright (c) 2018-2021 Status Research & Development GmbH
+# Copyright (c) 2018-2022 Status Research & Development GmbH
 # Licensed under either of
 #  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
 #    http://www.apache.org/licenses/LICENSE-2.0)
@@ -9,6 +9,8 @@
 # at your option. This file may not be copied, modified, or
 # distributed except according to those terms.
 
+{.used.}
+
 import
   unittest2,
   ../stew/interval_set

diff --git a/tests/test_io2.nim b/tests/test_io2.nim
@@ -1,3 +1,11 @@
+# Copyright (c) 2020-2022 Status Research & Development GmbH
+# Licensed and distributed under either of
+#   * MIT license: http://opensource.org/licenses/MIT
+#   * Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
+# at your option. This file may not be copied, modified, or distributed except according to those terms.
+
+{.used.}
+
 import unittest2
 import ../stew/io2
 

diff --git a/tests/test_keyed_queue.nim b/tests/test_keyed_queue.nim
@@ -1,5 +1,5 @@
 # Nimbus
-# Copyright (c) 2018-2019 Status Research & Development GmbH
+# Copyright (c) 2018-2022 Status Research & Development GmbH
 # Licensed under either of
 #  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
 #    http://www.apache.org/licenses/LICENSE-2.0)
@@ -8,6 +8,8 @@
 # at your option. This file may not be copied, modified, or distributed except
 # according to those terms.
 
+{.used.}
+
 import
   std/[algorithm, sequtils, strformat, strutils, tables],
   unittest2,

diff --git a/tests/test_macros.nim b/tests/test_macros.nim
@@ -1,8 +1,15 @@
+# Copyright (c) 2020-2022 Status Research & Development GmbH
+# Licensed and distributed under either of
+#   * MIT license: http://opensource.org/licenses/MIT
+#   * Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
+# at your option. This file may not be copied, modified, or distributed except according to those terms.
+
+{.used.}
+
 import
   unittest2,
   ../stew/shims/macros
 
-
 template unknown() {.pragma.}
 template zero() {.pragma.}
 template one(one: string) {.pragma.}

diff --git a/tests/test_ptrops.nim b/tests/test_ptrops.nim
@@ -1,12 +1,14 @@
 # stew
-# Copyright 2018-2019 Status Research & Development GmbH
+# Copyright 2018-2022 Status Research & Development GmbH
 # Licensed under either of
 #
 #  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
 #  * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
 #
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
+{.used.}
+
 import unittest2
 
 import ../stew/ptrops

diff --git a/tests/test_results.nim b/tests/test_results.nim
@@ -1,3 +1,5 @@
+{.used.}
+
 # nim-result is also available stand-alone from https://github.com/arnetheduck/nim-result/
 
 import ../stew/results

diff --git a/tests/test_sequtils2.nim b/tests/test_sequtils2.nim
@@ -1,10 +1,12 @@
 # byteutils
-# Copyright (c) 2018 Status Research & Development GmbH
+# Copyright (c) 2018-2022 Status Research & Development GmbH
 # Licensed and distributed under either of
 #   * MIT license (license terms in the root directory or at http://opensource.org/licenses/MIT).
 #   * Apache v2 license (license terms in the root directory or at http://www.apache.org/licenses/LICENSE-2.0).
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
+{.used.}
+
 import
   unittest2,
   ../stew/sequtils2

diff --git a/tests/test_sets.nim b/tests/test_sets.nim
@@ -1,3 +1,11 @@
+# Copyright (c) 2021-2022 Status Research & Development GmbH
+# Licensed and distributed under either of
+#   * MIT license: http://opensource.org/licenses/MIT
+#   * Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
+# at your option. This file may not be copied, modified, or distributed except according to those terms.
+
+{.used.}
+
 import
   unittest2,
   ../stew/shims/sets

diff --git a/tests/test_sorted_set.nim b/tests/test_sorted_set.nim
@@ -1,5 +1,5 @@
 # Nimbus
-# Copyright (c) 2018-2019 Status Research & Development GmbH
+# Copyright (c) 2018-2022 Status Research & Development GmbH
 # Licensed under either of
 #  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
 #    http://www.apache.org/licenses/LICENSE-2.0)
@@ -8,6 +8,8 @@
 # at your option. This file may not be copied, modified, or distributed except
 # according to those terms.
 
+{.used.}
+
 import
   std/[algorithm, sequtils, strformat, tables],
   ../stew/sorted_set,

diff --git a/tests/test_templateutils.nim b/tests/test_templateutils.nim
@@ -1,3 +1,11 @@
+# Copyright (c) 2021-2022 Status Research & Development GmbH
+# Licensed and distributed under either of
+#   * MIT license: http://opensource.org/licenses/MIT
+#   * Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
+# at your option. This file may not be copied, modified, or distributed except according to those terms.
+
+{.used.}
+
 import
   unittest2,
   ../stew/templateutils

diff --git a/tests/test_varints.nim b/tests/test_varints.nim
@@ -1,3 +1,11 @@
+# Copyright (c) 2019-2022 Status Research & Development GmbH
+# Licensed and distributed under either of
+#   * MIT license: http://opensource.org/licenses/MIT
+#   * Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
+# at your option. This file may not be copied, modified, or distributed except according to those terms.
+
+{.used.}
+
 import
   unittest2, random,
   ../stew/[varints, byteutils]

diff --git a/tests/test_winacl.nim b/tests/test_winacl.nim
@@ -1,5 +1,12 @@
+# Copyright (c) 2020-2022 Status Research & Development GmbH
+# Licensed and distributed under either of
+#   * MIT license: http://opensource.org/licenses/MIT
+#   * Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
+# at your option. This file may not be copied, modified, or distributed except according to those terms.
+
+{.used.}
+
 import unittest2
-import ../stew/io2
 
 when defined(windows):
   import ../stew/windows/acl