summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Dahl <ry@tinyclouds.org>2018-12-23 18:22:14 -0500
committerRyan Dahl <ry@tinyclouds.org>2018-12-24 11:31:17 -0500
commit32e1641628a94c89366e037ff57f8acb4fc0f2fe (patch)
tree2e32fd80e9975920291db368a6a93bc19d3efb7e
parentc002ea10fa45e3c6fdb70a4c3b3add2a081b0fa5 (diff)
deno_net -> deno_std rename
Also don't format external js/deps
-rw-r--r--.gitmodules6
m---------js/deps/https/deno.land/x/net0
m---------js/deps/https/deno.land/x/std0
-rwxr-xr-xtools/format.py2
-rwxr-xr-xtools/http_benchmark.py4
5 files changed, 6 insertions, 6 deletions
diff --git a/.gitmodules b/.gitmodules
index 66ec150e4..86e16fd72 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,6 +4,6 @@
[submodule "build"]
path = build
url = https://github.com/denoland/chromium_build.git
-[submodule "js/deps/https/deno.land/x/net"]
- path = js/deps/https/deno.land/x/net
- url = https://github.com/denoland/deno_net.git
+[submodule "js/deps/https/deno.land/x/std"]
+ path = js/deps/https/deno.land/x/std
+ url = https://github.com/denoland/deno_std.git
diff --git a/js/deps/https/deno.land/x/net b/js/deps/https/deno.land/x/net
deleted file mode 160000
-Subproject 958dadc8752f1aface8cff39c56011b016fb146
diff --git a/js/deps/https/deno.land/x/std b/js/deps/https/deno.land/x/std
new file mode 160000
+Subproject 731f03829cc7f4a29753a5a80156b22166233bc
diff --git a/tools/format.py b/tools/format.py
index d0f2dbab4..79282618d 100755
--- a/tools/format.py
+++ b/tools/format.py
@@ -41,7 +41,7 @@ qrun(["node", prettier, "--write", "--loglevel=error"] + ["rollup.config.js"] +
glob("*.json") + glob("*.md") +
find_exts([".github", "js", "tests", "tools", "website"],
[".js", ".json", ".ts", ".md"],
- skip=["tools/clang"]))
+ skip=["tools/clang", "js/deps"]))
print "rustfmt"
qrun([
diff --git a/tools/http_benchmark.py b/tools/http_benchmark.py
index 2ff34b831..05e54f173 100755
--- a/tools/http_benchmark.py
+++ b/tools/http_benchmark.py
@@ -18,8 +18,8 @@ def deno_http_benchmark(deno_exe):
def deno_net_http_benchmark(deno_exe):
deno_cmd = [
- deno_exe, "--allow-net", "js/deps/https/deno.land/x/net/http_bench.ts",
- ADDR
+ deno_exe, "--allow-net",
+ "js/deps/https/deno.land/x/std/net/http_bench.ts", ADDR
]
print "http_benchmark testing DENO using net/http."
return run(