Rename //src/ to //cli/ (denoland#1962)

To better distinguish the deno_core crate from the executable deno, which will now be called "the cli" internally.
zenozeng · Mar 19, 2019 · fa3c353 · fa3c353
1 parent c7d81fa
commit fa3c353
Show file tree

Hide file tree

Showing 32 changed files with 21 additions and 17 deletions.
diff --git a/BUILD.gn b/BUILD.gn
@@ -154,7 +154,7 @@ deno_cargo_info = exec_script("build_extra/rust/get_cargo_info.py",
  "json")
 
 rust_executable("deno") {
- source_root = "src/main.rs"
+ source_root = "cli/main.rs"
  extern = main_extern
  deps = [
  ":deno_deps",
@@ -170,7 +170,7 @@ rust_executable("deno") {
 }
 
 rust_test("test_rs") {
- source_root = "src/main.rs"
+ source_root = "cli/main.rs"
  extern = main_extern
  deps = [
  ":deno_deps",
@@ -257,13 +257,13 @@ bundle("compiler_bundle") {
 
 ts_flatbuffer("msg_ts") {
  sources = [
- "src/msg.fbs",
+ "cli/msg.fbs",
  ]
 }
 
 rust_flatbuffer("msg_rs") {
  sources = [
- "src/msg.fbs",
+ "cli/msg.fbs",
  ]
 }
 

diff --git a/Cargo.toml b/Cargo.toml
@@ -11,6 +11,10 @@ members = [
  "core",
 ]
 
+[[bin]]
+name = "deno"
+path = "cli/main.rs"
+
 [package]
 name = "deno"
 version = "0.3.3"

diff --git a/src/ansi.rs → cli/ansi.rs b/src/ansi.rs → cli/ansi.rs
diff --git a/src/cli.rs → cli/cli.rs b/src/cli.rs → cli/cli.rs
diff --git a/src/compiler.rs → cli/compiler.rs b/src/compiler.rs → cli/compiler.rs
diff --git a/src/deno_dir.rs → cli/deno_dir.rs b/src/deno_dir.rs → cli/deno_dir.rs
diff --git a/src/errors.rs → cli/errors.rs b/src/errors.rs → cli/errors.rs
diff --git a/src/flags.rs → cli/flags.rs b/src/flags.rs → cli/flags.rs
diff --git a/src/fs.rs → cli/fs.rs b/src/fs.rs → cli/fs.rs
diff --git a/src/global_timer.rs → cli/global_timer.rs b/src/global_timer.rs → cli/global_timer.rs
diff --git a/src/http_body.rs → cli/http_body.rs b/src/http_body.rs → cli/http_body.rs
diff --git a/src/http_util.rs → cli/http_util.rs b/src/http_util.rs → cli/http_util.rs
diff --git a/src/isolate.rs → cli/isolate.rs b/src/isolate.rs → cli/isolate.rs
diff --git a/src/isolate_state.rs → cli/isolate_state.rs b/src/isolate_state.rs → cli/isolate_state.rs
diff --git a/src/js_errors.rs → cli/js_errors.rs b/src/js_errors.rs → cli/js_errors.rs
diff --git a/src/main.rs → cli/main.rs b/src/main.rs → cli/main.rs
diff --git a/src/modules.rs → cli/modules.rs b/src/modules.rs → cli/modules.rs
diff --git a/src/msg.fbs → cli/msg.fbs b/src/msg.fbs → cli/msg.fbs
diff --git a/src/msg.rs → cli/msg.rs b/src/msg.rs → cli/msg.rs
diff --git a/src/msg_util.rs → cli/msg_util.rs b/src/msg_util.rs → cli/msg_util.rs
diff --git a/src/ops.rs → cli/ops.rs b/src/ops.rs → cli/ops.rs
diff --git a/src/permissions.rs → cli/permissions.rs b/src/permissions.rs → cli/permissions.rs
diff --git a/src/repl.rs → cli/repl.rs b/src/repl.rs → cli/repl.rs
diff --git a/src/resolve_addr.rs → cli/resolve_addr.rs b/src/resolve_addr.rs → cli/resolve_addr.rs
diff --git a/src/resources.rs → cli/resources.rs b/src/resources.rs → cli/resources.rs
diff --git a/src/startup_data.rs → cli/startup_data.rs b/src/startup_data.rs → cli/startup_data.rs
diff --git a/src/tokio_util.rs → cli/tokio_util.rs b/src/tokio_util.rs → cli/tokio_util.rs
diff --git a/src/tokio_write.rs → cli/tokio_write.rs b/src/tokio_write.rs → cli/tokio_write.rs
diff --git a/src/version.rs → cli/version.rs b/src/version.rs → cli/version.rs
diff --git a/src/workers.rs → cli/workers.rs b/src/workers.rs → cli/workers.rs
diff --git a/js/stat_test.ts b/js/stat_test.ts
@@ -12,9 +12,9 @@ testPerm({ read: true }, async function statSyncSuccess() {
  assert(testingInfo.isDirectory());
  assert(!testingInfo.isSymlink());
 
- const srcInfo = Deno.statSync("src");
- assert(srcInfo.isDirectory());
- assert(!srcInfo.isSymlink());
+ const testsInfo = Deno.statSync("tests");
+ assert(testsInfo.isDirectory());
+ assert(!testsInfo.isSymlink());
 });
 
 testPerm({ read: false }, async function statSyncPerm() {
@@ -54,9 +54,9 @@ testPerm({ read: true }, async function lstatSyncSuccess() {
  assert(!testingInfo.isDirectory());
  assert(testingInfo.isSymlink());
 
- const srcInfo = Deno.lstatSync("src");
- assert(srcInfo.isDirectory());
- assert(!srcInfo.isSymlink());
+ const testsInfo = Deno.lstatSync("tests");
+ assert(testsInfo.isDirectory());
+ assert(!testsInfo.isSymlink());
 });
 
 testPerm({ read: false }, async function lstatSyncPerm() {
@@ -96,9 +96,9 @@ testPerm({ read: true }, async function statSuccess() {
  assert(testingInfo.isDirectory());
  assert(!testingInfo.isSymlink());
 
- const srcInfo = await Deno.stat("src");
- assert(srcInfo.isDirectory());
- assert(!srcInfo.isSymlink());
+ const testsInfo = await Deno.stat("tests");
+ assert(testsInfo.isDirectory());
+ assert(!testsInfo.isSymlink());
 });
 
 testPerm({ read: false }, async function statPerm() {
@@ -138,9 +138,9 @@ testPerm({ read: true }, async function lstatSuccess() {
  assert(!testingInfo.isDirectory());
  assert(testingInfo.isSymlink());
 
- const srcInfo = await Deno.lstat("src");
- assert(srcInfo.isDirectory());
- assert(!srcInfo.isSymlink());
+ const testsInfo = await Deno.lstat("tests");
+ assert(testsInfo.isDirectory());
+ assert(!testsInfo.isSymlink());
 });
 
 testPerm({ read: false }, async function lstatPerm() {

diff --git a/tools/format.py b/tools/format.py
@@ -45,4 +45,4 @@ def qrun(cmd, env=None):
 qrun([
  "third_party/rustfmt/" + platform() +
  "/rustfmt", "--config-path", rustfmt_config, "build.rs"
-] + find_exts(["src", "core"], [".rs"]))
+] + find_exts(["cli", "core"], [".rs"]))