summaryrefslogtreecommitdiff
path: root/std/http
diff options
context:
space:
mode:
Diffstat (limited to 'std/http')
-rw-r--r--std/http/_io.ts2
-rw-r--r--std/http/_io_test.ts12
-rw-r--r--std/http/cookie_test.ts4
-rw-r--r--std/http/file_server.ts6
-rw-r--r--std/http/file_server_test.ts4
-rw-r--r--std/http/server.ts4
-rw-r--r--std/http/server_test.ts10
7 files changed, 21 insertions, 21 deletions
diff --git a/std/http/_io.ts b/std/http/_io.ts
index fefa6f657..1375edbb5 100644
--- a/std/http/_io.ts
+++ b/std/http/_io.ts
@@ -3,7 +3,7 @@ import { BufReader, BufWriter } from "../io/bufio.ts";
import { TextProtoReader } from "../textproto/mod.ts";
import { assert } from "../_util/assert.ts";
import { encoder } from "../encoding/utf8.ts";
-import { ServerRequest, Response } from "./server.ts";
+import { Response, ServerRequest } from "./server.ts";
import { STATUS_TEXT } from "./http_status.ts";
export function emptyReader(): Deno.Reader {
diff --git a/std/http/_io_test.ts b/std/http/_io_test.ts
index 7c7b3d8b4..14675a799 100644
--- a/std/http/_io_test.ts
+++ b/std/http/_io_test.ts
@@ -1,22 +1,22 @@
// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
import {
- assertThrowsAsync,
- assertEquals,
assert,
+ assertEquals,
assertNotEquals,
+ assertThrowsAsync,
} from "../testing/asserts.ts";
import {
bodyReader,
chunkedBodyReader,
- writeTrailers,
- readTrailers,
parseHTTPVersion,
readRequest,
+ readTrailers,
writeResponse,
+ writeTrailers,
} from "./_io.ts";
-import { encode, decode } from "../encoding/utf8.ts";
+import { decode, encode } from "../encoding/utf8.ts";
import { BufReader, ReadLineResult } from "../io/bufio.ts";
-import { ServerRequest, Response } from "./server.ts";
+import { Response, ServerRequest } from "./server.ts";
import { StringReader } from "../io/readers.ts";
import { mockConn } from "./_mock_conn.ts";
diff --git a/std/http/cookie_test.ts b/std/http/cookie_test.ts
index f34f5acae..0f7c68635 100644
--- a/std/http/cookie_test.ts
+++ b/std/http/cookie_test.ts
@@ -1,6 +1,6 @@
// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-import { ServerRequest, Response } from "./server.ts";
-import { getCookies, deleteCookie, setCookie } from "./cookie.ts";
+import { Response, ServerRequest } from "./server.ts";
+import { deleteCookie, getCookies, setCookie } from "./cookie.ts";
import { assert, assertEquals } from "../testing/asserts.ts";
Deno.test({
diff --git a/std/http/file_server.ts b/std/http/file_server.ts
index ff9a073e7..d8751eb84 100644
--- a/std/http/file_server.ts
+++ b/std/http/file_server.ts
@@ -6,13 +6,13 @@
// TODO Add tests like these:
// https://github.com/indexzero/http-server/blob/master/test/http-server-test.js
-import { posix, extname } from "../path/mod.ts";
+import { extname, posix } from "../path/mod.ts";
import {
+ HTTPSOptions,
listenAndServe,
listenAndServeTLS,
- ServerRequest,
Response,
- HTTPSOptions,
+ ServerRequest,
} from "./server.ts";
import { parse } from "../flags/mod.ts";
import { assert } from "../_util/assert.ts";
diff --git a/std/http/file_server_test.ts b/std/http/file_server_test.ts
index 93e6e5590..d8df631b8 100644
--- a/std/http/file_server_test.ts
+++ b/std/http/file_server_test.ts
@@ -3,8 +3,8 @@ import { assert, assertEquals } from "../testing/asserts.ts";
import { BufReader } from "../io/bufio.ts";
import { TextProtoReader } from "../textproto/mod.ts";
import { ServerRequest } from "./server.ts";
-import { serveFile, FileServerArgs } from "./file_server.ts";
-import { resolve, dirname, join, fromFileUrl } from "../path/mod.ts";
+import { FileServerArgs, serveFile } from "./file_server.ts";
+import { dirname, fromFileUrl, join, resolve } from "../path/mod.ts";
let fileServer: Deno.Process<Deno.RunOptions & { stdout: "piped" }>;
type FileServerCfg = Omit<FileServerArgs, "_"> & { target?: string };
diff --git a/std/http/server.ts b/std/http/server.ts
index 93f116fff..7bbdb7829 100644
--- a/std/http/server.ts
+++ b/std/http/server.ts
@@ -2,13 +2,13 @@
import { encode } from "../encoding/utf8.ts";
import { BufReader, BufWriter } from "../io/bufio.ts";
import { assert } from "../_util/assert.ts";
-import { deferred, Deferred, MuxAsyncIterator } from "../async/mod.ts";
+import { Deferred, deferred, MuxAsyncIterator } from "../async/mod.ts";
import {
bodyReader,
chunkedBodyReader,
emptyReader,
- writeResponse,
readRequest,
+ writeResponse,
} from "./_io.ts";
export class ServerRequest {
diff --git a/std/http/server_test.ts b/std/http/server_test.ts
index 564ec4e07..76b0bcff9 100644
--- a/std/http/server_test.ts
+++ b/std/http/server_test.ts
@@ -14,18 +14,18 @@ import {
assertThrowsAsync,
} from "../testing/asserts.ts";
import {
+ _parseAddrFromStr,
Response,
- ServerRequest,
- Server,
serve,
+ Server,
+ ServerRequest,
serveTLS,
- _parseAddrFromStr,
} from "./server.ts";
import { BufReader, BufWriter } from "../io/bufio.ts";
import { delay } from "../async/delay.ts";
-import { encode, decode } from "../encoding/utf8.ts";
+import { decode, encode } from "../encoding/utf8.ts";
import { mockConn } from "./_mock_conn.ts";
-import { resolve, dirname, join, fromFileUrl } from "../path/mod.ts";
+import { dirname, fromFileUrl, join, resolve } from "../path/mod.ts";
const moduleDir = dirname(fromFileUrl(import.meta.url));
const testdataDir = resolve(moduleDir, "testdata");