misc cleanups

15 files changed, 24 insertions, 35 deletions

diff --git a/src/config/config.nim b/src/config/config.nim
index 311d52e8..9ce5d89a 100644
--- a/src/config/config.nim
+++ b/src/config/config.nim
@@ -4,6 +4,7 @@ import std/streams
 import std/strutils
 import std/tables
 
+import chagashi/charset
 import config/chapath
 import config/mailcap
 import config/mimetypes
@@ -27,8 +28,6 @@ import types/url
 import utils/regexutils
 import utils/twtstr
 
-import chagashi/charset
-
 type
   ColorMode* = enum
     cmMonochrome, cmANSI, cmEightBit, cmTrueColor
diff --git a/src/css/cascade.nim b/src/css/cascade.nim
index 4fb69de8..78953303 100644
--- a/src/css/cascade.nim
+++ b/src/css/cascade.nim
@@ -2,6 +2,7 @@ import std/algorithm
 import std/options
 import std/strutils
 
+import chame/tags
 import css/cssparser
 import css/cssvalues
 import css/match
@@ -17,8 +18,6 @@ import layout/layoutunit
 import types/color
 import types/opt
 
-import chame/tags
-
 type
   RuleList* = array[PseudoElem, seq[CSSRuleDef]]
 
diff --git a/src/css/match.nim b/src/css/match.nim
index 52a8ab7f..02c921b9 100644
--- a/src/css/match.nim
+++ b/src/css/match.nim
@@ -2,6 +2,7 @@ import std/options
 import std/strutils
 import std/tables
 
+import chame/tags
 import css/cssparser
 import css/selectorparser
 import css/stylednode
@@ -9,8 +10,6 @@ import html/catom
 import html/dom
 import utils/twtstr
 
-import chame/tags
-
 #TODO rfNone should match insensitively for certain properties
 func attrSelectorMatches(elem: Element; sel: Selector): bool =
   case sel.rel.t
diff --git a/src/css/stylednode.nim b/src/css/stylednode.nim
index 0cfc8c64..a5d2b44b 100644
--- a/src/css/stylednode.nim
+++ b/src/css/stylednode.nim
@@ -1,9 +1,8 @@
+import chame/tags
 import css/cssvalues
 import css/selectorparser
 import html/dom
 
-import chame/tags
-
 # Container to hold a style and a node.
 # Pseudo-elements are implemented using StyledNode objects without nodes. Input
 # elements are implemented as internal "pseudo-elements."
diff --git a/src/html/dom.nim b/src/html/dom.nim
index 2fafc551..3e5dddd0 100644
--- a/src/html/dom.nim
+++ b/src/html/dom.nim
@@ -6,6 +6,9 @@ import std/sets
 import std/strutils
 import std/tables
 
+import chagashi/charset
+import chagashi/decoder
+import chame/tags
 import css/cssparser
 import css/cssvalues
 import css/mediaquery
@@ -44,11 +47,6 @@ import utils/mimeguess
 import utils/strwidth
 import utils/twtstr
 
-import chagashi/charset
-import chagashi/decoder
-
-import chame/tags
-
 type
   FormMethod* = enum
     fmGet = "get"
diff --git a/src/html/event.nim b/src/html/event.nim
index fd818048..576ebcd1 100644
--- a/src/html/event.nim
+++ b/src/html/event.nim
@@ -2,12 +2,12 @@ import std/math
 import std/options
 import std/times
 
-import monoucha/quickjs
-import monoucha/jserror
 import monoucha/fromjs
 import monoucha/javascript
+import monoucha/jserror
 import monoucha/jstypes
 import monoucha/jsutils
+import monoucha/quickjs
 import monoucha/tojs
 import types/opt
 
diff --git a/src/js/intl.nim b/src/js/intl.nim
index 4ae264e4..b980fb90 100644
--- a/src/js/intl.nim
+++ b/src/js/intl.nim
@@ -1,8 +1,8 @@
 # Very minimal Intl module... TODO make it more complete
 
-import monoucha/quickjs
 import monoucha/javascript
 import monoucha/jstypes
+import monoucha/quickjs
 import monoucha/tojs
 
 type
diff --git a/src/loader/loader.nim b/src/loader/loader.nim
index 31de14c3..7c76ae59 100644
--- a/src/loader/loader.nim
+++ b/src/loader/loader.nim
@@ -1071,7 +1071,7 @@ proc onError*(loader: FileLoader; fd: int) =
     when defined(debug):
       var lbuf {.noinit.}: array[BufferSize, char]
       if not response.body.isend:
-        let n = response.body.recvData(addr lbuf[0], lbuf.len)
+        let n = response.body.recvData(lbuf)
         assert n == 0
       assert response.body.isend
     response.bodyRead.resolve()
diff --git a/src/local/client.nim b/src/local/client.nim
index 78213b6e..24510106 100644
--- a/src/local/client.nim
+++ b/src/local/client.nim
@@ -475,7 +475,7 @@ proc handleRead(client: Client; fd: int) =
     var hadlf = true
     while true:
       try:
-        let n = estream.recvData(addr buffer[0], BufferSize)
+        let n = estream.recvData(buffer)
         if n == 0:
           break
         var i = 0
diff --git a/src/local/container.nim b/src/local/container.nim
index 1fddb490..a7702101 100644
--- a/src/local/container.nim
+++ b/src/local/container.nim
@@ -5,6 +5,7 @@ import std/posix
 import std/tables
 import std/unicode
 
+import chagashi/charset
 import config/config
 import config/mimetypes
 import img/bitmap
@@ -34,8 +35,6 @@ import utils/strwidth
 import utils/twtstr
 import utils/wordbreak
 
-import chagashi/charset
-
 type
   CursorPosition* = object
     cursorx*: int
diff --git a/src/local/lineedit.nim b/src/local/lineedit.nim
index 15cbdc54..17b343aa 100644
--- a/src/local/lineedit.nim
+++ b/src/local/lineedit.nim
@@ -1,8 +1,10 @@
 import std/strutils
 import std/unicode
 
-import monoucha/quickjs
+import chagashi/charset
+import chagashi/decoder
 import monoucha/javascript
+import monoucha/quickjs
 import types/cell
 import types/opt
 import types/winattrs
@@ -11,9 +13,6 @@ import utils/strwidth
 import utils/twtstr
 import utils/wordbreak
 
-import chagashi/charset
-import chagashi/decoder
-
 type
   LineEditState* = enum
     lesEdit, lesFinish, lesCancel
diff --git a/src/local/pager.nim b/src/local/pager.nim
index 5a3f84eb..643e7689 100644
--- a/src/local/pager.nim
+++ b/src/local/pager.nim
@@ -334,8 +334,7 @@ proc newPager*(config: Config; forkserver: ForkServer; ctx: JSContext;
 
 proc genClientKey(pager: Pager): ClientKey =
   var key: ClientKey
-  let n = pager.devRandom.recvData(addr key[0], key.len)
-  doAssert n == key.len
+  pager.devRandom.recvDataLoop(key)
   return key
 
 proc addLoaderClient*(pager: Pager; pid: int; config: LoaderClientConfig):
diff --git a/src/server/buffer.nim b/src/server/buffer.nim
index d0602a76..9cf14217 100644
--- a/src/server/buffer.nim
+++ b/src/server/buffer.nim
@@ -10,6 +10,10 @@ import std/selectors
 import std/tables
 import std/unicode
 
+import chagashi/charset
+import chagashi/decoder
+import chagashi/decodercore
+import chame/tags
 import config/config
 import css/cascade
 import css/cssparser
@@ -54,12 +58,6 @@ import types/winattrs
 import utils/strwidth
 import utils/twtstr
 
-import chagashi/charset
-import chagashi/decoder
-import chagashi/decodercore
-
-import chame/tags
-
 type
   BufferCommand* = enum
     bcLoad, bcForceRender, bcWindowChange, bcFindAnchor, bcReadSuccess,
diff --git a/src/types/cookie.nim b/src/types/cookie.nim
index a303b133..1b1c82cd 100644
--- a/src/types/cookie.nim
+++ b/src/types/cookie.nim
@@ -2,11 +2,11 @@ import std/strutils
 import std/times
 
 import io/urlfilter
-import monoucha/jserror
 import monoucha/javascript
+import monoucha/jserror
 import monoucha/jsregex
-import types/url
 import types/opt
+import types/url
 import utils/twtstr
 
 type
diff --git a/src/types/formdata.nim b/src/types/formdata.nim
index 26fd7975..27af9a5b 100644
--- a/src/types/formdata.nim
+++ b/src/types/formdata.nim
@@ -80,7 +80,7 @@ proc writeEntry*(stream: DynStream; entry: FormDataEntry; boundary: string) =
       if ps != nil:
         var buf {.noinit.}: array[4096, uint8]
         while true:
-          let n = ps.recvData(addr buf[0], 4096)
+          let n = ps.recvData(buf)
           if n == 0:
             break
           stream.sendDataLoop(addr buf[0], n)