Fixes for Nim 2.2

* xmlhttprequest: fix missing import
* painter: generic tuple workaround
* dynstream: merge module with implementations (so it will work with
  vtables)

Not enabling vtables yet since it doesn't work with refc.

4 files changed, 1 insertions, 6 deletions

diff --git a/src/loader/cgi.nim b/src/loader/cgi.nim
index ee3d3160..e5fa33c4 100644
--- a/src/loader/cgi.nim
+++ b/src/loader/cgi.nim
@@ -4,7 +4,6 @@ import std/posix
 import std/strutils
 
 import io/dynstream
-import io/posixstream
 import io/stdio
 import loader/connecterror
 import loader/headers
diff --git a/src/loader/loader.nim b/src/loader/loader.nim
index 4121d351..fec07d99 100644
--- a/src/loader/loader.nim
+++ b/src/loader/loader.nim
@@ -33,10 +33,8 @@ import std/tables
 import io/bufreader
 import io/bufwriter
 import io/dynstream
-import io/posixstream
 import io/promise
 import io/serversocket
-import io/socketstream
 import io/tempfile
 import io/urlfilter
 import loader/cgi
diff --git a/src/loader/loaderhandle.nim b/src/loader/loaderhandle.nim
index b1b04dee..aa3a32d4 100644
--- a/src/loader/loaderhandle.nim
+++ b/src/loader/loaderhandle.nim
@@ -4,7 +4,6 @@ import std/tables
 
 import io/bufwriter
 import io/dynstream
-import io/posixstream
 import loader/headers
 
 when defined(debug):
diff --git a/src/loader/response.nim b/src/loader/response.nim
index bbf41741..e97e931b 100644
--- a/src/loader/response.nim
+++ b/src/loader/response.nim
@@ -4,9 +4,8 @@ import std/tables
 import chagashi/charset
 import chagashi/decoder
 import img/bitmap
-import io/posixstream
+import io/dynstream
 import io/promise
-import io/socketstream
 import loader/headers
 import loader/request
 import monoucha/javascript