From 14d852e0d40ce71d916545b54ac86c2e35315f62 Mon Sep 17 00:00:00 2001 From: Jacek Sieka Date: Fri, 8 Apr 2022 11:11:53 +0200 Subject: [PATCH] style fixes (#108) --- websock/extensions/extutils.nim | 2 +- websock/http/server.nim | 10 +++------- websock/session.nim | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/websock/extensions/extutils.nim b/websock/extensions/extutils.nim index 7e768ad..5a1a19e 100644 --- a/websock/extensions/extutils.nim +++ b/websock/extensions/extutils.nim @@ -137,7 +137,7 @@ proc parseExt*[T: BChar](data: openArray[T], output: var seq[AppExt]): bool = ext.params[^1].name = system.move(param.name) ext.params[^1].value = system.move(param.value) - if lex.tok notin {tkSemCol, tkComma, tkEof}: + if lex.tok notin {tkSemcol, tkComma, tkEof}: return false output.setLen(output.len + 1) diff --git a/websock/http/server.nim b/websock/http/server.nim index a3230ea..e4f7a63 100644 --- a/websock/http/server.nim +++ b/websock/http/server.nim @@ -149,12 +149,10 @@ proc handleTlsConnCb( maxVersion = tlsHttpServer.maxVersion, flags = tlsHttpServer.tlsFlags) - var stream: AsyncStream - try: - stream = AsyncStream( + let stream = AsyncStream( reader: tlsStream.reader, writer: tlsStream.writer) - + try: let httpServer = HttpServer(server) let request = await httpServer.parseRequest(stream) @@ -164,9 +162,7 @@ proc handleTlsConnCb( finally: await stream.closeWait() -proc accept*(server: HttpServer): Future[HttpRequest] - {.async, raises: [Defect, HttpError].} = - +proc accept*(server: HttpServer): Future[HttpRequest] {.async.} = if not isNil(server.handler): raise newException(HttpError, "Callback already registered - cannot mix callback and accepts styles!") diff --git a/websock/session.nim b/websock/session.nim index 6af9e77..6349964 100644 --- a/websock/session.nim +++ b/websock/session.nim @@ -153,7 +153,7 @@ proc handleClose*( code = StatusFulfilled reason = "" - case payload.len: + case payLoad.len: of 0: code = StatusNoStatus of 1: