From a7c7c9f38ef7ec34a5ac4eba32ac162f33db62b2 Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvarkus@gmail.com>
Date: Tue, 7 Sep 2021 18:04:28 -0400
Subject: [PATCH] Move Deno out of the workspace

---
 .gitignore                               | 2 +-
 Cargo.toml                               | 6 ++++--
 cts_runner/Cargo.toml                    | 1 +
 deno_webgpu/Cargo.toml                   | 3 ---
 deno_webgpu/{ => src}/binding.rs         | 0
 deno_webgpu/{ => src}/buffer.rs          | 0
 deno_webgpu/{ => src}/bundle.rs          | 0
 deno_webgpu/{ => src}/command_encoder.rs | 0
 deno_webgpu/{ => src}/compute_pass.rs    | 0
 deno_webgpu/{ => src}/error.rs           | 0
 deno_webgpu/{ => src}/lib.rs             | 0
 deno_webgpu/{ => src}/pipeline.rs        | 0
 deno_webgpu/{ => src}/queue.rs           | 0
 deno_webgpu/{ => src}/render_pass.rs     | 0
 deno_webgpu/{ => src}/sampler.rs         | 0
 deno_webgpu/{ => src}/shader.rs          | 0
 deno_webgpu/{ => src}/texture.rs         | 0
 17 files changed, 6 insertions(+), 6 deletions(-)
 rename deno_webgpu/{ => src}/binding.rs (100%)
 rename deno_webgpu/{ => src}/buffer.rs (100%)
 rename deno_webgpu/{ => src}/bundle.rs (100%)
 rename deno_webgpu/{ => src}/command_encoder.rs (100%)
 rename deno_webgpu/{ => src}/compute_pass.rs (100%)
 rename deno_webgpu/{ => src}/error.rs (100%)
 rename deno_webgpu/{ => src}/lib.rs (100%)
 rename deno_webgpu/{ => src}/pipeline.rs (100%)
 rename deno_webgpu/{ => src}/queue.rs (100%)
 rename deno_webgpu/{ => src}/render_pass.rs (100%)
 rename deno_webgpu/{ => src}/sampler.rs (100%)
 rename deno_webgpu/{ => src}/shader.rs (100%)
 rename deno_webgpu/{ => src}/texture.rs (100%)

diff --git a/.gitignore b/.gitignore
index 0dbbf45426..1c43d0f4fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 # Generated by Cargo
 # will have compiled files and executables
-/target/
+target/
 Cargo.lock
 
 # These are backup files generated by rustfmt
diff --git a/Cargo.toml b/Cargo.toml
index fe9499a919..f11e2f4382 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,8 +1,6 @@
 [workspace]
 resolver = "2"
 members = [
-    "cts_runner",
-    "deno_webgpu",
     "dummy",
     "player",
     "wgpu",
@@ -11,6 +9,10 @@ members = [
     "wgpu-info",
     "wgpu-types",
 ]
+exclude = [
+    "cts_runner",
+    "deno_webgpu",
+]
 default-members = ["wgpu", "wgpu-hal", "wgpu-info"]
 
 [patch."https://github.com/gfx-rs/naga"]
diff --git a/cts_runner/Cargo.toml b/cts_runner/Cargo.toml
index 6a88022a26..ee6c0c5390 100644
--- a/cts_runner/Cargo.toml
+++ b/cts_runner/Cargo.toml
@@ -8,6 +8,7 @@ edition = "2018"
 description = "CTS runner for wgpu"
 license = "MIT OR Apache-2.0"
 publish = false
+resolver = "2"
 
 [dependencies]
 deno_console = { git = "https://github.com/denoland/deno", rev = "ca75752e5a9499a0a997809f02b18c2ba1ecd58d" }
diff --git a/deno_webgpu/Cargo.toml b/deno_webgpu/Cargo.toml
index 2a94d1ea89..c0e9aa3177 100644
--- a/deno_webgpu/Cargo.toml
+++ b/deno_webgpu/Cargo.toml
@@ -10,9 +10,6 @@ readme = "README.md"
 repository = "https://github.com/gfx-rs/wgpu"
 description = "WebGPU implementation for Deno"
 
-[lib]
-path = "lib.rs"
-
 [dependencies]
 deno_core = { git = "https://github.com/denoland/deno", rev = "ca75752e5a9499a0a997809f02b18c2ba1ecd58d" }
 serde = { version = "1.0", features = ["derive"] }
diff --git a/deno_webgpu/binding.rs b/deno_webgpu/src/binding.rs
similarity index 100%
rename from deno_webgpu/binding.rs
rename to deno_webgpu/src/binding.rs
diff --git a/deno_webgpu/buffer.rs b/deno_webgpu/src/buffer.rs
similarity index 100%
rename from deno_webgpu/buffer.rs
rename to deno_webgpu/src/buffer.rs
diff --git a/deno_webgpu/bundle.rs b/deno_webgpu/src/bundle.rs
similarity index 100%
rename from deno_webgpu/bundle.rs
rename to deno_webgpu/src/bundle.rs
diff --git a/deno_webgpu/command_encoder.rs b/deno_webgpu/src/command_encoder.rs
similarity index 100%
rename from deno_webgpu/command_encoder.rs
rename to deno_webgpu/src/command_encoder.rs
diff --git a/deno_webgpu/compute_pass.rs b/deno_webgpu/src/compute_pass.rs
similarity index 100%
rename from deno_webgpu/compute_pass.rs
rename to deno_webgpu/src/compute_pass.rs
diff --git a/deno_webgpu/error.rs b/deno_webgpu/src/error.rs
similarity index 100%
rename from deno_webgpu/error.rs
rename to deno_webgpu/src/error.rs
diff --git a/deno_webgpu/lib.rs b/deno_webgpu/src/lib.rs
similarity index 100%
rename from deno_webgpu/lib.rs
rename to deno_webgpu/src/lib.rs
diff --git a/deno_webgpu/pipeline.rs b/deno_webgpu/src/pipeline.rs
similarity index 100%
rename from deno_webgpu/pipeline.rs
rename to deno_webgpu/src/pipeline.rs
diff --git a/deno_webgpu/queue.rs b/deno_webgpu/src/queue.rs
similarity index 100%
rename from deno_webgpu/queue.rs
rename to deno_webgpu/src/queue.rs
diff --git a/deno_webgpu/render_pass.rs b/deno_webgpu/src/render_pass.rs
similarity index 100%
rename from deno_webgpu/render_pass.rs
rename to deno_webgpu/src/render_pass.rs
diff --git a/deno_webgpu/sampler.rs b/deno_webgpu/src/sampler.rs
similarity index 100%
rename from deno_webgpu/sampler.rs
rename to deno_webgpu/src/sampler.rs
diff --git a/deno_webgpu/shader.rs b/deno_webgpu/src/shader.rs
similarity index 100%
rename from deno_webgpu/shader.rs
rename to deno_webgpu/src/shader.rs
diff --git a/deno_webgpu/texture.rs b/deno_webgpu/src/texture.rs
similarity index 100%
rename from deno_webgpu/texture.rs
rename to deno_webgpu/src/texture.rs