Move deno_std to a more convenient location. (#3057)

js/deps/https/deno.land/std -> js/std
This commit is contained in:
Ryan Dahl 2019-10-04 14:49:32 -04:00 committed by GitHub
parent eecb4fea26
commit ddcad56ee9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 18 additions and 28 deletions

2
.gitmodules vendored
View file

@ -2,7 +2,7 @@
path = core/libdeno/build path = core/libdeno/build
url = https://github.com/denoland/chromium_build.git url = https://github.com/denoland/chromium_build.git
[submodule "deno_std"] [submodule "deno_std"]
path = js/deps/https/deno.land/std path = std
url = https://github.com/denoland/deno_std.git url = https://github.com/denoland/deno_std.git
[submodule "deno_third_party"] [submodule "deno_third_party"]
path = third_party path = third_party

View file

@ -1,4 +1,4 @@
import { assert } from "../../../js/deps/https/deno.land/std/testing/asserts.ts"; import { assert } from "../../../std/testing/asserts.ts";
import "./nest_imported.ts"; import "./nest_imported.ts";
const handler = (e: Event): void => { const handler = (e: Event): void => {

View file

@ -1,4 +1,4 @@
import { assert } from "../../../js/deps/https/deno.land/std/testing/asserts.ts"; import { assert } from "../../../std/testing/asserts.ts";
import "./imported.ts"; import "./imported.ts";
const eventHandler = (e: Event): void => { const eventHandler = (e: Event): void => {

View file

@ -1,4 +1,4 @@
import { assert } from "../../../js/deps/https/deno.land/std/testing/asserts.ts"; import { assert } from "../../../std/testing/asserts.ts";
const handler = (e: Event): void => { const handler = (e: Event): void => {
assert(!e.cancelable); assert(!e.cancelable);

View file

@ -1,9 +1,6 @@
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license. // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
import { import { serve, ServerRequest } from "../../std/http/server.ts";
serve, import { assertEquals } from "../../std/testing/asserts.ts";
ServerRequest
} from "../../js/deps/https/deno.land/std/http/server.ts";
import { assertEquals } from "../../js/deps/https/deno.land/std/testing/asserts.ts";
const addr = Deno.args[1] || "127.0.0.1:4555"; const addr = Deno.args[1] || "127.0.0.1:4555";

View file

@ -1,5 +1,5 @@
// Run ./tools/http_server.py too in order for this test to run. // Run ./tools/http_server.py too in order for this test to run.
import { assert } from "../js/deps/https/deno.land/std/testing/asserts.ts"; import { assert } from "../std/testing/asserts.ts";
// TODO Top level await https://github.com/denoland/deno/issues/471 // TODO Top level await https://github.com/denoland/deno/issues/471
async function main(): Promise<void> { async function main(): Promise<void> {

View file

@ -7,8 +7,8 @@ edition = "2018"
description = "Provides snapshots for the deno CLI" description = "Provides snapshots for the deno CLI"
repository = "https://github.com/denoland/deno" repository = "https://github.com/denoland/deno"
exclude = [ exclude = [
"deps/https/deno.land/std/fs/testdata/0-link.ts", "std/fs/testdata/0-link.ts",
"deps/https/deno.land/std/fs/testdata/copy_dir_link_file/0.txt", "std/fs/testdata/copy_dir_link_file/0.txt",
] ]
[lib] [lib]

View file

@ -7,11 +7,8 @@
// tests by the special string. permW1N0 means allow-write but not allow-net. // tests by the special string. permW1N0 means allow-write but not allow-net.
// See tools/unit_tests.py for more details. // See tools/unit_tests.py for more details.
import * as testing from "./deps/https/deno.land/std/testing/mod.ts"; import * as testing from "../std/testing/mod.ts";
import { import { assert, assertEquals } from "../std/testing/asserts.ts";
assert,
assertEquals
} from "./deps/https/deno.land/std/testing/asserts.ts";
export { export {
assert, assert,
assertThrows, assertThrows,
@ -21,7 +18,7 @@ export {
assertStrictEq, assertStrictEq,
assertStrContains, assertStrContains,
unreachable unreachable
} from "./deps/https/deno.land/std/testing/asserts.ts"; } from "../std/testing/asserts.ts";
interface TestPermissions { interface TestPermissions {
read?: boolean; read?: boolean;

View file

@ -55,7 +55,7 @@ import "./version_test.ts";
import "../website/app_test.ts"; import "../website/app_test.ts";
import { runIfMain } from "./deps/https/deno.land/std/testing/mod.ts"; import { runIfMain } from "../std/testing/mod.ts";
async function main(): Promise<void> { async function main(): Promise<void> {
// Testing entire test suite serially // Testing entire test suite serially

View file

@ -211,8 +211,8 @@ def run_http(build_dir, new_data):
def bundle_benchmark(deno_exe): def bundle_benchmark(deno_exe):
bundles = { bundles = {
"file_server": "./js/deps/https/deno.land/std/http/file_server.ts", "file_server": "./std/http/file_server.ts",
"gist": "./js/deps/https/deno.land/std/examples/gist.ts", "gist": "./std/examples/gist.ts",
} }
sizes = {} sizes = {}

View file

@ -1,8 +1,5 @@
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license. // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
import { import { serve, ServerRequest } from "../std/http/server.ts";
serve,
ServerRequest
} from "../js/deps/https/deno.land/std/http/server.ts";
const addr = Deno.args[1] || "127.0.0.1:4500"; const addr = Deno.args[1] || "127.0.0.1:4500";
const originAddr = Deno.args[2] || "127.0.0.1:4501"; const originAddr = Deno.args[2] || "127.0.0.1:4501";

View file

@ -55,8 +55,7 @@ def deno_tcp_current_thread(deno_exe):
def deno_http(deno_exe): def deno_http(deno_exe):
port = get_port() port = get_port()
deno_cmd = [ deno_cmd = [
deno_exe, "run", "--allow-net", deno_exe, "run", "--allow-net", "std/http/http_bench.ts",
"js/deps/https/deno.land/std/http/http_bench.ts",
server_addr(port) server_addr(port)
] ]
print "http_benchmark testing DENO using net/http." print "http_benchmark testing DENO using net/http."

View file

@ -1,7 +1,7 @@
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license. // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
import { test, assertEquals } from "../js/test_util.ts"; import { test, assertEquals } from "../js/test_util.ts";
import { runIfMain } from "../js/deps/https/deno.land/std/testing/mod.ts"; import { runIfMain } from "../std/testing/mod.ts";
import { import {
BenchmarkRun, BenchmarkRun,
createBinarySizeColumns, createBinarySizeColumns,