Deprecate TaintedString (#15423)

Co-authored-by: Timothee Cour <timothee.cour2@gmail.com>
Co-authored-by: Dominik Picheta <dominikpicheta@googlemail.com>
This commit is contained in:
Juan Carlos 2021-01-15 23:56:38 -03:00 • committed by GitHub
commit 78a99587a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
36 changed files with 184 additions and 229 deletions

View file

@ -62,7 +62,7 @@ proc doCaasCommand(session: var NimSession, command: string): string =
result = ""
while true:
var line = TaintedString("")
var line = ""
if session.nim.outputStream.readLine(line):
if line.string == "": break
result.add(line.string & "\n")
@ -78,7 +78,7 @@ proc doProcCommand(session: var NimSession, command: string): string =
var
process = startProcess(NimBin, args = session.replaceVars(command).split)
stream = outputStream(process)
line = TaintedString("")
line = ""
result = ""
while stream.readLine(line):
@ -113,12 +113,12 @@ proc doScenario(script: string, output: Stream, mode: TRunMode, verbose: bool):
result = true
var f = open(script)
var project = TaintedString("")
var project = ""
if f.readLine(project):
var
s = startNimSession(script.parentDir / project.string, script, mode)
tline = TaintedString("")
tline = ""
ln = 1
while f.readLine(tline):

View file

@ -102,7 +102,7 @@ proc getFileDir(filename: string): string =
proc execCmdEx2(command: string, args: openArray[string]; workingDir, input: string = ""): tuple[
cmdLine: string,
output: TaintedString,
output: string,
exitCode: int] {.tags:
[ExecIOEffect, ReadIOEffect, RootEffect], gcsafe.} =
@ -122,7 +122,7 @@ proc execCmdEx2(command: string, args: openArray[string]; workingDir, input: str
close instream
result.exitCode = -1
var line = newStringOfCap(120).TaintedString
var line = newStringOfCap(120)
while true:
if outp.readLine(line):
result.output.string.add(line.string)
@ -161,7 +161,7 @@ proc callCompiler(cmdTemplate, filename, options, nimcache: string,
var x = newStringOfCap(120)
result.nimout = ""
while true:
if outp.readLine(x.TaintedString):
if outp.readLine(x):
result.nimout.add(x & "\n")
if x =~ pegOfInterest:
# `err` should contain the last error/warning message
@ -210,7 +210,7 @@ proc callCCompiler(cmdTemplate, filename, options: string,
result.output = ""
result.line = -1
while true:
if outp.readLine(x.TaintedString):
if outp.readLine(x):
result.nimout.add(x & "\n")
elif not running(p):
break