jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

improve rendering of newOSError.additionalInfo (#18443)

Browse source 
* improve rendering of newOSError.additionalInfo

* fixup
This commit is contained in:
Timothee Cour 2021-07-07 00:43:16 -07:00 • committed by GitHub
commit ffce6de84c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/pure/includes/oserr.nim
View file

@ -80,8 +80,9 @@ proc newOSError*(
e.msg = osErrorMsg(errorCode) e.msg = osErrorMsg(errorCode)
if additionalInfo.len > 0: if additionalInfo.len > 0:
if e.msg.len > 0 and e.msg[^1] != '\n': e.msg.add '\n' if e.msg.len > 0 and e.msg[^1] != '\n': e.msg.add '\n'
e.msg.add "Additional info: " e.msg.add "Additional info: "
e.msg.addQuoted additionalInfo e.msg.add additionalInfo
# don't add trailing `.` etc, which negatively impacts "jump to file" in IDEs.
if e.msg == "": if e.msg == "":
e.msg = "unknown OS error" e.msg = "unknown OS error"
return e return e

4
lib/pure/net.nim
View file

@ -958,7 +958,9 @@ proc bindAddr*(socket: Socket, port = Port(0), address = "") {.
var aiList = getAddrInfo(realaddr, port, socket.domain) var aiList = getAddrInfo(realaddr, port, socket.domain)
if bindAddr(socket.fd, aiList.ai_addr, aiList.ai_addrlen.SockLen) < 0'i32: if bindAddr(socket.fd, aiList.ai_addr, aiList.ai_addrlen.SockLen) < 0'i32:
freeaddrinfo(aiList) freeaddrinfo(aiList)
raiseOSError(osLastError(), "address: $# port: $#" % [address, $port]) var address2: string
address2.addQuoted address
raiseOSError(osLastError(), "address: $# port: $#" % [address2, $port])
freeaddrinfo(aiList) freeaddrinfo(aiList)
proc acceptAddr*(server: Socket, client: var owned(Socket), address: var string, proc acceptAddr*(server: Socket, client: var owned(Socket), address: var string,