-template foo(a, b: SomeType)
template foo(a, b: SomeType)
-
This does nothing
diff --git a/nimdoc/testproject/expected/theindex.html b/nimdoc/testproject/expected/theindex.html
index fc5c0e1c56..106a3be1d5 100644
--- a/nimdoc/testproject/expected/theindex.html
+++ b/nimdoc/testproject/expected/theindex.html
@@ -1227,9 +1227,9 @@ function main() {
- bar:
- testproject: bar[T](a, b: T): T
+ data-doc-search-tag="testproject: bar[T](a, b: T): T" href="testproject.html#bar%2CT%2CT">testproject: bar[T](a, b: T): T
- testproject: bar(): untyped
+ data-doc-search-tag="testproject: bar(): untyped" href="testproject.html#bar.m%2C">testproject: bar(): untyped
- enumValueA:
- foo:
- testproject: foo(a, b: SomeType)
+ data-doc-search-tag="testproject: foo(a, b: SomeType)" href="testproject.html#foo.t%2CSomeType%2CSomeType">testproject: foo(a, b: SomeType)
- SomeType:
- someType:
- utils: someType(): SomeType
+ data-doc-search-tag="utils: someType(): SomeType" href="subdir/subdir_b/utils.html#someType%2C">utils: someType(): SomeType
diff --git a/tests/async/tasyncfilewrite.nim b/tests/async/tasyncfilewrite.nim
index 8439778ca3..373b93301b 100644
--- a/tests/async/tasyncfilewrite.nim
+++ b/tests/async/tasyncfilewrite.nim
@@ -9,6 +9,7 @@ import os, asyncfile, asyncdispatch
const F = "test_async.txt"
removeFile(F)
+defer: removeFile(F)
let f = openAsync(F, fmWrite)
var futs = newSeq[Future[void]]()
for i in 1..3:
diff --git a/tests/destructor/tprevent_assign.nim b/tests/destructor/tprevent_assign.nim
new file mode 100644
index 0000000000..108ccc3715
--- /dev/null
+++ b/tests/destructor/tprevent_assign.nim
@@ -0,0 +1,33 @@
+discard """
+ errormsg: "'=' is not available for type ; requires a copy because it's not the last read of 'otherTree'"
+ line: 29
+"""
+
+type
+ Foo = object
+ x: int
+
+proc `=destroy`(f: var Foo) = f.x = 0
+proc `=`(a: var Foo; b: Foo) {.error.} # = a.x = b.x
+proc `=sink`(a: var Foo; b: Foo) = a.x = b.x
+
+proc createTree(x: int): Foo =
+ Foo(x: x)
+
+proc take2(a, b: sink Foo) =
+ echo a.x, " ", b.x
+
+proc allowThis() =
+ # all these temporary lets are harmless:
+ let otherTree = createTree(44)
+ let b = otherTree
+ let c = b
+ take2(createTree(34), c)
+
+proc preventThis() =
+ let otherTree = createTree(44)
+ let b = otherTree
+ take2(createTree(34), otherTree)
+
+allowThis()
+preventThis()
diff --git a/tests/generics/t8694.nim b/tests/generics/t8694.nim
new file mode 100644
index 0000000000..da6c6dbed2
--- /dev/null
+++ b/tests/generics/t8694.nim
@@ -0,0 +1,31 @@
+discard """
+ output: '''
+true
+true
+true
+'''
+"""
+
+when true:
+ # Error: undeclared identifier: '|'
+ proc bar[T](t:T): bool =
+ runnableExamples:
+ type Foo = int | float
+ true
+ echo bar(0)
+
+when true:
+ # ok
+ proc bar(t:int): bool =
+ runnableExamples:
+ type Foo = int | float
+ true
+ echo bar(0)
+
+when true:
+ # Error: undeclared identifier: '|'
+ proc bar(t:typedesc): bool =
+ runnableExamples:
+ type Foo = int | float
+ true
+ echo bar(int)
diff --git a/tests/generics/t9130.nim b/tests/generics/t9130.nim
new file mode 100644
index 0000000000..a993bc6b23
--- /dev/null
+++ b/tests/generics/t9130.nim
@@ -0,0 +1,33 @@
+when true:
+ # stack overflow
+ template baz1*(iter: untyped): untyped =
+ runnableExamples:
+ import sugar
+ proc fun(a: proc(x:int): int) = discard
+ baz1(fun(x:int => x))
+ discard
+
+ proc foo1[A](ts: A) =
+ baz1(ts)
+
+when true:
+ # ok
+ template baz2*(iter: untyped): untyped =
+ runnableExamples:
+ import sugar
+ proc fun(a: proc(x:int): int) = discard
+ baz2(fun(x:int => x))
+ discard
+
+ proc foo2(ts: int) =
+ baz2(ts)
+
+when true:
+ # stack overflow
+ template baz3*(iter: untyped): untyped =
+ runnableExamples:
+ baz3(fun(x:int => x))
+ discard
+
+ proc foo3[A](ts: A) =
+ baz3(ts)
diff --git a/tests/testament/categories.nim b/tests/testament/categories.nim
index 2c55bd0bd5..59ce70315a 100644
--- a/tests/testament/categories.nim
+++ b/tests/testament/categories.nim
@@ -218,7 +218,7 @@ proc ioTests(r: var TResults, cat: Category, options: string) =
# dummy compile result:
var c = initResults()
testSpec c, makeTest("tests/system/helpers/readall_echo", options, cat)
- testSpec r, makeTest("tests/system/io", options, cat)
+ testSpec r, makeTest("tests/system/tio", options, cat)
# ------------------------- async tests ---------------------------------------
proc asyncTests(r: var TResults, cat: Category, options: string) =
diff --git a/tools/dochack/fuzzysearch.nim b/tools/dochack/fuzzysearch.nim
index e6b1ea3cda..69f9fce3c2 100644
--- a/tools/dochack/fuzzysearch.nim
+++ b/tools/dochack/fuzzysearch.nim
@@ -86,7 +86,7 @@ proc fuzzyMatch*(pattern, str: cstring) : tuple[score: int, matched: bool] =
score += ord(LeadingCharMatch)
var onBoundary = (patIndex == high(pattern))
- if not onBoundary:
+ if not onBoundary and strIndex < high(str):
let
nextPatternChar = toLowerAscii(pattern[patIndex + 1])
nextStrChar = toLowerAscii(str[strIndex + 1])
diff --git a/tools/kochdocs.nim b/tools/kochdocs.nim
index d24eba5dc3..3c4ded75e4 100644
--- a/tools/kochdocs.nim
+++ b/tools/kochdocs.nim
@@ -94,6 +94,8 @@ doc/manual/var_t_return.rst
lib/system.nim
lib/system/nimscript.nim
lib/pure/ospaths.nim
+lib/pure/parsejson.nim
+lib/pure/cstrutils.nim
lib/core/macros.nim
lib/pure/marshal.nim
lib/core/typeinfo.nim
@@ -102,6 +104,7 @@ lib/pure/typetraits.nim
nimsuggest/sexp.nim
lib/pure/concurrency/threadpool.nim
lib/pure/concurrency/cpuinfo.nim
+lib/pure/concurrency/cpuload.nim
lib/js/dom.nim
lib/js/jsffi.nim
lib/js/jsconsole.nim
@@ -139,6 +142,7 @@ lib/pure/browsers.nim
lib/impure/db_postgres.nim
lib/impure/db_mysql.nim
lib/impure/db_sqlite.nim
+lib/impure/db_odbc.nim
lib/pure/db_common.nim
lib/pure/httpserver.nim
lib/pure/httpclient.nim
@@ -156,6 +160,9 @@ lib/pure/mimetypes.nim
lib/pure/json.nim
lib/pure/base64.nim
lib/pure/scgi.nim
+lib/impure/nre.nim
+lib/deprecated/pure/sockets.nim
+lib/deprecated/pure/asyncio.nim
lib/pure/collections/tables.nim
lib/pure/collections/sets.nim
lib/pure/collections/lists.nim
@@ -166,6 +173,7 @@ lib/pure/collections/queues.nim
lib/pure/collections/deques.nim
lib/pure/encodings.nim
lib/pure/collections/sequtils.nim
+lib/pure/collections/rtarrays.nim
lib/pure/cookies.nim
lib/pure/memfiles.nim
lib/pure/subexes.nim
@@ -194,6 +202,7 @@ lib/pure/selectors.nim
lib/pure/sugar.nim
lib/pure/collections/chains.nim
lib/pure/asyncfile.nim
+lib/deprecated/pure/ftpclient.nim
lib/pure/asyncftpclient.nim
lib/pure/lenientops.nim
lib/pure/md5.nim
@@ -203,7 +212,9 @@ lib/pure/oswalkdir.nim
lib/pure/collections/heapqueue.nim
lib/pure/fenv.nim
lib/std/sha1.nim
+lib/std/varints.nim
lib/impure/rdstdin.nim
+lib/wrappers/linenoise/linenoise.nim
lib/pure/strformat.nim
lib/pure/segfaults.nim
lib/pure/mersenne.nim
@@ -230,6 +241,8 @@ lib/wrappers/odbcsql.nim
lib/wrappers/pcre.nim
lib/wrappers/openssl.nim
lib/posix/posix.nim
+lib/posix/linux.nim
+lib/posix/termios.nim
lib/wrappers/odbcsql.nim
lib/js/jscore.nim
""".splitWhitespace()