From ddcad56ee9bc762171fd88585fd7ab3e3da19e1e Mon Sep 17 00:00:00 2001
From: Ryan Dahl <ry@tinyclouds.org>
Date: Fri, 4 Oct 2019 14:49:32 -0400
Subject: Move deno_std to a more convenient location. (#3057)

js/deps/https/deno.land/std -> js/std
---
 js/Cargo.toml               | 4 ++--
 js/deps/https/deno.land/std | 1 -
 js/test_util.ts             | 9 +++------
 js/unit_tests.ts            | 2 +-
 4 files changed, 6 insertions(+), 10 deletions(-)
 delete mode 160000 js/deps/https/deno.land/std

(limited to 'js')

diff --git a/js/Cargo.toml b/js/Cargo.toml
index f36ca7de7..40cc43d93 100644
--- a/js/Cargo.toml
+++ b/js/Cargo.toml
@@ -7,8 +7,8 @@ edition = "2018"
 description = "Provides snapshots for the deno CLI"
 repository = "https://github.com/denoland/deno"
 exclude = [
-  "deps/https/deno.land/std/fs/testdata/0-link.ts",
-  "deps/https/deno.land/std/fs/testdata/copy_dir_link_file/0.txt",
+  "std/fs/testdata/0-link.ts",
+  "std/fs/testdata/copy_dir_link_file/0.txt",
 ]
 
 [lib]
diff --git a/js/deps/https/deno.land/std b/js/deps/https/deno.land/std
deleted file mode 160000
index 43aafbf33..000000000
--- a/js/deps/https/deno.land/std
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 43aafbf33285753e7b42230f0eb7969b300f71cf
diff --git a/js/test_util.ts b/js/test_util.ts
index 52e09301b..bb75082e6 100644
--- a/js/test_util.ts
+++ b/js/test_util.ts
@@ -7,11 +7,8 @@
 // tests by the special string. permW1N0 means allow-write but not allow-net.
 // See tools/unit_tests.py for more details.
 
-import * as testing from "./deps/https/deno.land/std/testing/mod.ts";
-import {
-  assert,
-  assertEquals
-} from "./deps/https/deno.land/std/testing/asserts.ts";
+import * as testing from "../std/testing/mod.ts";
+import { assert, assertEquals } from "../std/testing/asserts.ts";
 export {
   assert,
   assertThrows,
@@ -21,7 +18,7 @@ export {
   assertStrictEq,
   assertStrContains,
   unreachable
-} from "./deps/https/deno.land/std/testing/asserts.ts";
+} from "../std/testing/asserts.ts";
 
 interface TestPermissions {
   read?: boolean;
diff --git a/js/unit_tests.ts b/js/unit_tests.ts
index 2da67c40e..a83b57c15 100644
--- a/js/unit_tests.ts
+++ b/js/unit_tests.ts
@@ -55,7 +55,7 @@ import "./version_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> {
   // Testing entire test suite serially
-- 
cgit v1.2.3