completely consider void, giving discard check error again

compiler/semexprs.nim

@@ -2119,7 +2119,10 @@ proc semProcBody(c: PContext, n: PNode; expectedType: PType = nil): PNode =
       return n
   openScope(c)
   result = semExpr(c, n, expectedType = expectedType)
-  if c.p.resultSym != nil and not isEmptyType(result.typ):
+  if c.p.resultSym != nil and
+      not isEmptyType(result.typ) and
+      sfUsed notin c.p.resultSym.flags:
+    incl(c.p.resultSym.flags, sfUsed)
     if result.kind == nkNilLit:
       # or ImplicitlyDiscardable(result):
       # new semantic: 'result = x' triggers the void context
@@ -2131,14 +2134,6 @@ proc semProcBody(c: PContext, n: PNode; expectedType: PType = nil): PNode =
       # are not expressions:
       fixNilType(c, result)
     else:
-      if sfUsed in c.p.resultSym.flags:
-        var last = result
-        while last.kind in {nkStmtList, nkStmtListExpr}:
-          last = last.lastSon
-        localError(c.config, last.info, "cannot use implicit return, " &
-          "the `result` symbol was used in '" & c.p.owner.name.s & "'; " &
-          "got expression of type '" & last.typ.typeToString & "'")
-      incl(c.p.resultSym.flags, sfUsed)
       var a = newNodeI(nkAsgn, n.info, 2)
       a[0] = newSymNode(c.p.resultSym)
       a[1] = result

lib/packages/docutils/rst.nim

@@ -2842,7 +2842,7 @@ proc readTableRow(p: var RstParser): ColSeq =
 proc getColContents(p: var RstParser, colLim: ColumnLimits): string =
   for i in colLim.first ..< colLim.last:
     result.add(p.tok[i].symbol)
-  result.strip
+  result = result.strip
 
 proc isValidDelimiterRow(p: var RstParser, colNum: int): bool =
   let row = readTableRow(p)

tests/discard/tvoidcontext1.nim

@@ -1,8 +1,12 @@
+discard """
+  errormsg: '''expression '"invalid"' is of type 'string' and has to be used (or discarded)'''
+  line: 12
+"""
+
 proc valid*(): string =
   let x = 317
   "valid"
 
 proc invalid*(): string =
   result = "foo"
-  "invalid" #[tt.Error
-  ^ cannot use implicit return, the `result` symbol was used in 'invalid'; got expression of type 'string']#
+  "invalid"

tests/discard/tvoidcontext2.nim

@@ -1,9 +1,13 @@
+discard """
+  errormsg: '''expression '"invalid"' is of type 'string' and has to be used (or discarded)'''
+  line: 11
+"""
+
 proc foo(x: var string) =
   x = "hello"
 
 proc bar(): string =
   foo(result)
-  "invalid" #[tt.Error
-  ^ cannot use implicit return, the `result` symbol was used in 'bar'; got expression of type 'string']#
+  "invalid"
 
 echo bar()