diff options
-rw-r--r-- | BUILD.gn | 8 | ||||
-rw-r--r-- | Cargo.toml | 4 | ||||
-rw-r--r-- | cli/ansi.rs (renamed from src/ansi.rs) | 0 | ||||
-rw-r--r-- | cli/cli.rs (renamed from src/cli.rs) | 0 | ||||
-rw-r--r-- | cli/compiler.rs (renamed from src/compiler.rs) | 0 | ||||
-rw-r--r-- | cli/deno_dir.rs (renamed from src/deno_dir.rs) | 0 | ||||
-rw-r--r-- | cli/errors.rs (renamed from src/errors.rs) | 0 | ||||
-rw-r--r-- | cli/flags.rs (renamed from src/flags.rs) | 0 | ||||
-rw-r--r-- | cli/fs.rs (renamed from src/fs.rs) | 0 | ||||
-rw-r--r-- | cli/global_timer.rs (renamed from src/global_timer.rs) | 0 | ||||
-rw-r--r-- | cli/http_body.rs (renamed from src/http_body.rs) | 0 | ||||
-rw-r--r-- | cli/http_util.rs (renamed from src/http_util.rs) | 0 | ||||
-rw-r--r-- | cli/isolate.rs (renamed from src/isolate.rs) | 0 | ||||
-rw-r--r-- | cli/isolate_state.rs (renamed from src/isolate_state.rs) | 0 | ||||
-rw-r--r-- | cli/js_errors.rs (renamed from src/js_errors.rs) | 0 | ||||
-rw-r--r-- | cli/main.rs (renamed from src/main.rs) | 0 | ||||
-rw-r--r-- | cli/modules.rs (renamed from src/modules.rs) | 0 | ||||
-rw-r--r-- | cli/msg.fbs (renamed from src/msg.fbs) | 0 | ||||
-rw-r--r-- | cli/msg.rs (renamed from src/msg.rs) | 0 | ||||
-rw-r--r-- | cli/msg_util.rs (renamed from src/msg_util.rs) | 0 | ||||
-rw-r--r-- | cli/ops.rs (renamed from src/ops.rs) | 0 | ||||
-rw-r--r-- | cli/permissions.rs (renamed from src/permissions.rs) | 0 | ||||
-rw-r--r-- | cli/repl.rs (renamed from src/repl.rs) | 0 | ||||
-rw-r--r-- | cli/resolve_addr.rs (renamed from src/resolve_addr.rs) | 0 | ||||
-rw-r--r-- | cli/resources.rs (renamed from src/resources.rs) | 0 | ||||
-rw-r--r-- | cli/startup_data.rs (renamed from src/startup_data.rs) | 0 | ||||
-rw-r--r-- | cli/tokio_util.rs (renamed from src/tokio_util.rs) | 0 | ||||
-rw-r--r-- | cli/tokio_write.rs (renamed from src/tokio_write.rs) | 0 | ||||
-rw-r--r-- | cli/version.rs (renamed from src/version.rs) | 0 | ||||
-rw-r--r-- | cli/workers.rs (renamed from src/workers.rs) | 0 | ||||
-rw-r--r-- | js/stat_test.ts | 24 | ||||
-rwxr-xr-x | tools/format.py | 2 |
32 files changed, 21 insertions, 17 deletions
@@ -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 index b603ac593..5864d268c 100644 --- 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 b/cli/ansi.rs index 95b5e0694..95b5e0694 100644 --- a/src/ansi.rs +++ b/cli/ansi.rs diff --git a/src/cli.rs b/cli/cli.rs index 42b2b29f8..42b2b29f8 100644 --- a/src/cli.rs +++ b/cli/cli.rs diff --git a/src/compiler.rs b/cli/compiler.rs index 2d6e4a4b7..2d6e4a4b7 100644 --- a/src/compiler.rs +++ b/cli/compiler.rs diff --git a/src/deno_dir.rs b/cli/deno_dir.rs index 829af5aa2..829af5aa2 100644 --- a/src/deno_dir.rs +++ b/cli/deno_dir.rs diff --git a/src/errors.rs b/cli/errors.rs index 65118d070..65118d070 100644 --- a/src/errors.rs +++ b/cli/errors.rs diff --git a/src/flags.rs b/cli/flags.rs index d6a63a9fb..d6a63a9fb 100644 --- a/src/flags.rs +++ b/cli/flags.rs diff --git a/src/global_timer.rs b/cli/global_timer.rs index eef70ddc2..eef70ddc2 100644 --- a/src/global_timer.rs +++ b/cli/global_timer.rs diff --git a/src/http_body.rs b/cli/http_body.rs index 235463ff1..235463ff1 100644 --- a/src/http_body.rs +++ b/cli/http_body.rs diff --git a/src/http_util.rs b/cli/http_util.rs index 8aadbe136..8aadbe136 100644 --- a/src/http_util.rs +++ b/cli/http_util.rs diff --git a/src/isolate.rs b/cli/isolate.rs index 379203dd3..379203dd3 100644 --- a/src/isolate.rs +++ b/cli/isolate.rs diff --git a/src/isolate_state.rs b/cli/isolate_state.rs index 4cc010389..4cc010389 100644 --- a/src/isolate_state.rs +++ b/cli/isolate_state.rs diff --git a/src/js_errors.rs b/cli/js_errors.rs index 90c9f2007..90c9f2007 100644 --- a/src/js_errors.rs +++ b/cli/js_errors.rs diff --git a/src/main.rs b/cli/main.rs index 4657a3a4d..4657a3a4d 100644 --- a/src/main.rs +++ b/cli/main.rs diff --git a/src/modules.rs b/cli/modules.rs index 908c31b6d..908c31b6d 100644 --- a/src/modules.rs +++ b/cli/modules.rs diff --git a/src/msg.fbs b/cli/msg.fbs index 243034cfb..243034cfb 100644 --- a/src/msg.fbs +++ b/cli/msg.fbs diff --git a/src/msg.rs b/cli/msg.rs index 080f39de8..080f39de8 100644 --- a/src/msg.rs +++ b/cli/msg.rs diff --git a/src/msg_util.rs b/cli/msg_util.rs index 71bcc19d9..71bcc19d9 100644 --- a/src/msg_util.rs +++ b/cli/msg_util.rs diff --git a/src/ops.rs b/cli/ops.rs index 254a21563..254a21563 100644 --- a/src/ops.rs +++ b/cli/ops.rs diff --git a/src/permissions.rs b/cli/permissions.rs index 9093c14f0..9093c14f0 100644 --- a/src/permissions.rs +++ b/cli/permissions.rs diff --git a/src/repl.rs b/cli/repl.rs index 55bf4a114..55bf4a114 100644 --- a/src/repl.rs +++ b/cli/repl.rs diff --git a/src/resolve_addr.rs b/cli/resolve_addr.rs index f26655be1..f26655be1 100644 --- a/src/resolve_addr.rs +++ b/cli/resolve_addr.rs diff --git a/src/resources.rs b/cli/resources.rs index 1540f4ff7..1540f4ff7 100644 --- a/src/resources.rs +++ b/cli/resources.rs diff --git a/src/startup_data.rs b/cli/startup_data.rs index 29ae4db7d..29ae4db7d 100644 --- a/src/startup_data.rs +++ b/cli/startup_data.rs diff --git a/src/tokio_util.rs b/cli/tokio_util.rs index 810b826b4..810b826b4 100644 --- a/src/tokio_util.rs +++ b/cli/tokio_util.rs diff --git a/src/tokio_write.rs b/cli/tokio_write.rs index 945de375d..945de375d 100644 --- a/src/tokio_write.rs +++ b/cli/tokio_write.rs diff --git a/src/version.rs b/cli/version.rs index e6ec9008b..e6ec9008b 100644 --- a/src/version.rs +++ b/cli/version.rs diff --git a/src/workers.rs b/cli/workers.rs index edded7756..edded7756 100644 --- a/src/workers.rs +++ b/cli/workers.rs diff --git a/js/stat_test.ts b/js/stat_test.ts index 3a109c0b5..ae6477d79 100644 --- 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 index 74323708a..bc6a3b532 100755 --- a/tools/format.py +++ b/tools/format.py @@ -45,4 +45,4 @@ print "rustfmt" qrun([ "third_party/rustfmt/" + platform() + "/rustfmt", "--config-path", rustfmt_config, "build.rs" -] + find_exts(["src", "core"], [".rs"])) +] + find_exts(["cli", "core"], [".rs"])) |