diff options
author | andy finch <andyfinch7@gmail.com> | 2019-03-18 20:03:37 -0400 |
---|---|---|
committer | Ryan Dahl <ry@tinyclouds.org> | 2019-03-18 20:03:37 -0400 |
commit | cdfd32dd74d6286afe99fb5400e3dc0e9f2cec49 (patch) | |
tree | e8daa342c70ee472de28158d5448ed2078d0d9e9 /src/cli.rs | |
parent | 34a2aa4de6cfe334cf0d26620d244d5c66a976a4 (diff) |
Re-implement init scripts in core (#1958)
Re-enables arm64 CI test
Diffstat (limited to 'src/cli.rs')
-rw-r--r-- | src/cli.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/cli.rs b/src/cli.rs index d80587013..42b2b29f8 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -3,7 +3,6 @@ #![allow(dead_code)] use crate::errors::DenoResult; -use crate::isolate_init::IsolateInit; use crate::isolate_state::IsolateState; use crate::ops; use crate::permissions::DenoPermissions; @@ -11,6 +10,7 @@ use deno_core::deno_buf; use deno_core::deno_mod; use deno_core::Behavior; use deno_core::Op; +use deno_core::StartupData; use std::sync::atomic::Ordering; use std::sync::Arc; @@ -21,19 +21,19 @@ pub type Buf = Box<[u8]>; /// Implements deno_core::Behavior for the main Deno command-line. pub struct Cli { - init: IsolateInit, + startup_data: Option<StartupData>, pub state: Arc<IsolateState>, pub permissions: Arc<DenoPermissions>, // TODO(ry) move to IsolateState } impl Cli { pub fn new( - init: IsolateInit, + startup_data: Option<StartupData>, state: Arc<IsolateState>, permissions: DenoPermissions, ) -> Self { Self { - init, + startup_data, state, permissions: Arc::new(permissions), } @@ -66,8 +66,8 @@ impl Cli { } impl Behavior for Cli { - fn startup_snapshot(&mut self) -> Option<deno_buf> { - self.init.snapshot.take() + fn startup_data(&mut self) -> Option<StartupData> { + self.startup_data.take() } fn resolve(&mut self, specifier: &str, referrer: deno_mod) -> deno_mod { |