summaryrefslogtreecommitdiff
path: root/cli
diff options
context:
space:
mode:
Diffstat (limited to 'cli')
-rw-r--r--cli/BUILD.gn2
-rw-r--r--cli/Cargo.toml4
-rw-r--r--cli/cli_behavior.rs10
-rw-r--r--cli/compiler.rs10
-rw-r--r--cli/errors.rs2
-rw-r--r--cli/flags.rs2
-rw-r--r--cli/isolate.rs12
-rw-r--r--cli/isolate_state.rs2
-rw-r--r--cli/js_errors.rs6
-rw-r--r--cli/modules.rs2
-rw-r--r--cli/ops.rs8
-rw-r--r--cli/resources.rs2
-rw-r--r--cli/startup_data.rs4
-rw-r--r--cli/version.rs2
-rw-r--r--cli/workers.rs4
15 files changed, 36 insertions, 36 deletions
diff --git a/cli/BUILD.gn b/cli/BUILD.gn
index f6000a08f..32c00d8cf 100644
--- a/cli/BUILD.gn
+++ b/cli/BUILD.gn
@@ -8,7 +8,7 @@ import("//third_party/v8/snapshot_toolchain.gni")
import("../deno.gni")
main_extern = [
- "../core:deno_core",
+ "../core:deno",
"$rust_build:ansi_term",
"$rust_build:atty",
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index c58558887..6c25486a1 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -11,12 +11,12 @@ name = "deno"
path = "main.rs"
[package]
-name = "deno"
+name = "deno_cli"
version = "0.3.5"
edition = "2018"
[dependencies]
-deno_core = { path = "../core" }
+deno = { path = "../core" }
ansi_term = "0.11.0"
atty = "0.2.11"
diff --git a/cli/cli_behavior.rs b/cli/cli_behavior.rs
index c077d1ad1..05f2cf006 100644
--- a/cli/cli_behavior.rs
+++ b/cli/cli_behavior.rs
@@ -1,13 +1,13 @@
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
use crate::isolate_state::*;
use crate::ops;
-use deno_core::deno_buf;
-use deno_core::Behavior;
-use deno_core::Op;
-use deno_core::StartupData;
+use deno::deno_buf;
+use deno::Behavior;
+use deno::Op;
+use deno::StartupData;
use std::sync::Arc;
-/// Implements deno_core::Behavior for the main Deno command-line.
+/// Implements deno::Behavior for the main Deno command-line.
pub struct CliBehavior {
startup_data: Option<StartupData>,
pub state: Arc<IsolateState>,
diff --git a/cli/compiler.rs b/cli/compiler.rs
index f0e4f23f3..4613aff99 100644
--- a/cli/compiler.rs
+++ b/cli/compiler.rs
@@ -8,11 +8,11 @@ use crate::resources::ResourceId;
use crate::startup_data;
use crate::workers;
use crate::workers::WorkerBehavior;
-use deno_core::deno_buf;
-use deno_core::Behavior;
-use deno_core::Buf;
-use deno_core::Op;
-use deno_core::StartupData;
+use deno::deno_buf;
+use deno::Behavior;
+use deno::Buf;
+use deno::Op;
+use deno::StartupData;
use futures::Future;
use serde_json;
use std::str;
diff --git a/cli/errors.rs b/cli/errors.rs
index dd1b6e6a7..a2c3c3441 100644
--- a/cli/errors.rs
+++ b/cli/errors.rs
@@ -2,7 +2,7 @@
use crate::js_errors::JSErrorColor;
pub use crate::msg::ErrorKind;
use crate::resolve_addr::ResolveAddrError;
-use deno_core::JSError;
+use deno::JSError;
use hyper;
use std;
use std::fmt;
diff --git a/cli/flags.rs b/cli/flags.rs
index e14077dae..9d187ecac 100644
--- a/cli/flags.rs
+++ b/cli/flags.rs
@@ -1,5 +1,5 @@
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
-use deno_core::v8_set_flags;
+use deno::v8_set_flags;
use getopts;
use getopts::Options;
diff --git a/cli/isolate.rs b/cli/isolate.rs
index 711c46ead..15ad4e125 100644
--- a/cli/isolate.rs
+++ b/cli/isolate.rs
@@ -8,10 +8,10 @@ use crate::isolate_state::IsolateStateContainer;
use crate::js_errors;
use crate::msg;
use crate::tokio_util;
-use deno_core;
-use deno_core::deno_mod;
-use deno_core::Behavior;
-use deno_core::JSError;
+use deno;
+use deno::deno_mod;
+use deno::Behavior;
+use deno::JSError;
use futures::Async;
use futures::Future;
use std::sync::atomic::Ordering;
@@ -20,9 +20,9 @@ use std::sync::Arc;
pub trait DenoBehavior: Behavior + IsolateStateContainer + Send {}
impl<T> DenoBehavior for T where T: Behavior + IsolateStateContainer + Send {}
-type CoreIsolate<B> = deno_core::Isolate<B>;
+type CoreIsolate<B> = deno::Isolate<B>;
-/// Wraps deno_core::Isolate to provide source maps, ops for the CLI, and
+/// Wraps deno::Isolate to provide source maps, ops for the CLI, and
/// high-level module loading
pub struct Isolate<B: Behavior> {
inner: CoreIsolate<B>,
diff --git a/cli/isolate_state.rs b/cli/isolate_state.rs
index f38f76e71..9f6749925 100644
--- a/cli/isolate_state.rs
+++ b/cli/isolate_state.rs
@@ -5,7 +5,7 @@ use crate::flags;
use crate::global_timer::GlobalTimer;
use crate::modules::Modules;
use crate::permissions::DenoPermissions;
-use deno_core::Buf;
+use deno::Buf;
use futures::sync::mpsc as async_mpsc;
use std;
use std::env;
diff --git a/cli/js_errors.rs b/cli/js_errors.rs
index b478849d2..0bcc1176f 100644
--- a/cli/js_errors.rs
+++ b/cli/js_errors.rs
@@ -1,8 +1,8 @@
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
-//! This mod adds source maps and ANSI color display to deno_core::JSError.
+//! This mod adds source maps and ANSI color display to deno::JSError.
use crate::ansi;
-use deno_core::JSError;
-use deno_core::StackFrame;
+use deno::JSError;
+use deno::StackFrame;
use source_map_mappings::parse_mappings;
use source_map_mappings::Bias;
use source_map_mappings::Mappings;
diff --git a/cli/modules.rs b/cli/modules.rs
index 6de76b8fe..e2ded67b2 100644
--- a/cli/modules.rs
+++ b/cli/modules.rs
@@ -2,7 +2,7 @@
use crate::ansi;
use crate::deno_dir::DenoDir;
use crate::msg;
-use deno_core::deno_mod;
+use deno::deno_mod;
use std::collections::HashMap;
use std::collections::HashSet;
use std::fmt;
diff --git a/cli/ops.rs b/cli/ops.rs
index af2757648..a7c2e868f 100644
--- a/cli/ops.rs
+++ b/cli/ops.rs
@@ -18,10 +18,10 @@ use crate::resources::Resource;
use crate::tokio_util;
use crate::tokio_write;
use crate::version;
-use deno_core::deno_buf;
-use deno_core::Buf;
-use deno_core::JSError;
-use deno_core::Op;
+use deno::deno_buf;
+use deno::Buf;
+use deno::JSError;
+use deno::Op;
use flatbuffers::FlatBufferBuilder;
use futures;
use futures::Async;
diff --git a/cli/resources.rs b/cli/resources.rs
index 76004ae50..5b08e4b32 100644
--- a/cli/resources.rs
+++ b/cli/resources.rs
@@ -16,7 +16,7 @@ use crate::http_body::HttpBody;
use crate::isolate_state::WorkerChannels;
use crate::repl::Repl;
-use deno_core::Buf;
+use deno::Buf;
use futures;
use futures::Future;
diff --git a/cli/startup_data.rs b/cli/startup_data.rs
index 747e8b11d..7f59c0678 100644
--- a/cli/startup_data.rs
+++ b/cli/startup_data.rs
@@ -1,6 +1,6 @@
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
-use deno_core::deno_buf;
-use deno_core::{Script, StartupData};
+use deno::deno_buf;
+use deno::{Script, StartupData};
pub fn deno_isolate_init() -> StartupData {
if cfg!(feature = "no-snapshot-init") {
diff --git a/cli/version.rs b/cli/version.rs
index e6ec9008b..4b9509af9 100644
--- a/cli/version.rs
+++ b/cli/version.rs
@@ -2,5 +2,5 @@
pub const DENO: &str = env!("CARGO_PKG_VERSION");
pub fn v8() -> &'static str {
- deno_core::v8_version()
+ deno::v8_version()
}
diff --git a/cli/workers.rs b/cli/workers.rs
index 2be6f66b7..0c8d49fa7 100644
--- a/cli/workers.rs
+++ b/cli/workers.rs
@@ -4,8 +4,8 @@ use crate::isolate_state::WorkerChannels;
use crate::js_errors::JSErrorColor;
use crate::resources;
use crate::tokio_util;
-use deno_core::Buf;
-use deno_core::JSError;
+use deno::Buf;
+use deno::JSError;
use futures::future::lazy;
use futures::sync::mpsc;
use futures::sync::oneshot;
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-25 11:10:20 +0000