From 198e396eadad704e96c9f37e24effc89a904f570 Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Wed, 31 Oct 2018 11:11:10 -0700 Subject: Support cargo check (#1128) - Based on code from @qti3e and @piscisaureus in #724 and #1125 respectively. - TODO The DENO_BUILD_PATH env var must be supplied and must be an absolute path, this restriction should be removed in future work. --- src/main.rs | 20 ++++++++++---------- src/msg.rs | 4 +++- 2 files changed, 13 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/main.rs b/src/main.rs index 515f60f88..0defa6838 100644 --- a/src/main.rs +++ b/src/main.rs @@ -23,21 +23,21 @@ extern crate log; #[macro_use] extern crate futures; -mod deno_dir; -mod errors; -mod flags; +pub mod deno_dir; +pub mod errors; +pub mod flags; mod fs; mod http_util; -mod isolate; -mod libdeno; -mod msg; +pub mod isolate; +pub mod libdeno; +pub mod msg; pub mod ops; -mod permissions; -mod resources; -mod snapshot; +pub mod permissions; +pub mod resources; +pub mod snapshot; mod tokio_util; mod tokio_write; -mod version; +pub mod version; #[cfg(unix)] mod eager_unix; diff --git a/src/msg.rs b/src/msg.rs index 8b66704fc..5c0244509 100644 --- a/src/msg.rs +++ b/src/msg.rs @@ -1,4 +1,6 @@ #![allow(unused_imports)] #![allow(dead_code)] use flatbuffers; -include!(concat!(env!("OUT_DIR"), "/gen/msg_generated.rs")); +// TODO Replace DENO_BUILD_PATH with OUT_DIR. gn/ninja should generate into +// the same output directory as cargo uses. +include!(concat!(env!("DENO_BUILD_PATH"), "/gen/msg_generated.rs")); -- cgit v1.2.3