Rename crates: 'deno' to 'deno_core' and 'deno_cli' to 'deno' (denola…

…nd#3600)

cli/Cargo.toml

@@ -1,7 +1,7 @@
 # Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
 
 [package]
-name = "deno_cli"
+name = "deno"
 version = "0.28.1"
 license = "MIT"
 authors = ["the Deno authors"]
@@ -11,7 +11,7 @@ repository = "https://github.com/denoland/deno"
 default-run = "deno"
 
 [lib]
-name = "deno_cli"
+name = "deno"
 path = "lib.rs"
 
 [[bin]]
@@ -22,7 +22,7 @@ path = "main.rs"
 deno_typescript = { path = "../deno_typescript", version = "0.28.1" }
 
 [dependencies]
-deno = { path = "../core", version = "0.28.1" }
+deno_core = { path = "../core", version = "0.28.1" }
 deno_typescript = { path = "../deno_typescript", version = "0.28.1" }
 
 ansi_term = "0.12.1"

cli/compilers/json.rs

@@ -3,7 +3,7 @@ use crate::compilers::CompiledModule;
 use crate::compilers::CompiledModuleFuture;
 use crate::file_fetcher::SourceFile;
 use crate::futures::future::FutureExt;
-use deno::ErrBox;
+use deno_core::ErrBox;
 use regex::Regex;
 use std::pin::Pin;
 use std::str;

cli/compilers/mod.rs

@@ -1,5 +1,5 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-use deno::ErrBox;
+use deno_core::ErrBox;
 use futures::Future;
 
 mod js;

cli/compilers/ts.rs

@@ -12,9 +12,9 @@ use crate::startup_data;
 use crate::state::*;
 use crate::version;
 use crate::worker::Worker;
-use deno::Buf;
-use deno::ErrBox;
-use deno::ModuleSpecifier;
+use deno_core::Buf;
+use deno_core::ErrBox;
+use deno_core::ModuleSpecifier;
 use futures::future::FutureExt;
 use futures::Future;
 use regex::Regex;
@@ -604,7 +604,7 @@ mod tests {
  use super::*;
  use crate::fs as deno_fs;
  use crate::tokio_util;
- use deno::ModuleSpecifier;
+ use deno_core::ModuleSpecifier;
  use std::path::PathBuf;
  use tempfile::TempDir;
 
@@ -652,7 +652,7 @@ mod tests {
  .parent()
  .unwrap()
  .join("tests/002_hello.ts");
- use deno::ModuleSpecifier;
+ use deno_core::ModuleSpecifier;
  let module_name = ModuleSpecifier::resolve_url_or_path(p.to_str().unwrap())
  .unwrap()
  .to_string();

cli/deno_error.rs

@@ -3,9 +3,9 @@ use crate::diagnostics::Diagnostic;
 use crate::fmt_errors::JSError;
 use crate::import_map::ImportMapError;
 pub use crate::msg::ErrorKind;
-use deno::AnyError;
-use deno::ErrBox;
-use deno::ModuleResolutionError;
+use deno_core::AnyError;
+use deno_core::ErrBox;
+use deno_core::ModuleResolutionError;
 use dlopen::Error as DlopenError;
 use http::uri;
 use hyper;
@@ -355,9 +355,9 @@ mod tests {
  use crate::diagnostics::Diagnostic;
  use crate::diagnostics::DiagnosticCategory;
  use crate::diagnostics::DiagnosticItem;
- use deno::ErrBox;
- use deno::StackFrame;
- use deno::V8Exception;
+ use deno_core::ErrBox;
+ use deno_core::StackFrame;
+ use deno_core::V8Exception;
 
  fn js_error() -> JSError {
  JSError::new(V8Exception {

cli/file_fetcher.rs

@@ -8,8 +8,8 @@ use crate::http_util;
 use crate::http_util::FetchOnceResult;
 use crate::msg;
 use crate::progress::Progress;
-use deno::ErrBox;
-use deno::ModuleSpecifier;
+use deno_core::ErrBox;
+use deno_core::ModuleSpecifier;
 use futures::future::Either;
 use futures::future::FutureExt;
 use serde_json;

cli/fmt_errors.rs

@@ -3,9 +3,9 @@
 use crate::colors;
 use crate::source_maps::apply_source_map;
 use crate::source_maps::SourceMapGetter;
-use deno::ErrBox;
-use deno::StackFrame;
-use deno::V8Exception;
+use deno_core::ErrBox;
+use deno_core::StackFrame;
+use deno_core::V8Exception;
 use std::error::Error;
 use std::fmt;
 

cli/fs.rs

@@ -5,7 +5,7 @@ use std::io::ErrorKind;
 use std::io::Write;
 use std::path::{Path, PathBuf};
 
-use deno::ErrBox;
+use deno_core::ErrBox;
 use rand;
 use rand::Rng;
 use url::Url;

cli/global_state.rs

@@ -13,8 +13,8 @@ use crate::metrics::Metrics;
 use crate::msg;
 use crate::permissions::DenoPermissions;
 use crate::progress::Progress;
-use deno::ErrBox;
-use deno::ModuleSpecifier;
+use deno_core::ErrBox;
+use deno_core::ModuleSpecifier;
 use std;
 use std::env;
 use std::future::Future;

cli/http_util.rs

@@ -3,7 +3,7 @@ use crate::deno_error;
 use crate::deno_error::DenoError;
 use crate::version;
 use bytes::Bytes;
-use deno::ErrBox;
+use deno_core::ErrBox;
 use futures::future::FutureExt;
 use reqwest;
 use reqwest::header::HeaderMap;

cli/import_map.rs

@@ -1,5 +1,5 @@
-use deno::ErrBox;
-use deno::ModuleSpecifier;
+use deno_core::ErrBox;
+use deno_core::ModuleSpecifier;
 use indexmap::IndexMap;
 use serde_json::Map;
 use serde_json::Value;

cli/js.rs

@@ -28,9 +28,11 @@ pub fn get_asset(name: &str) -> Option<&'static str> {
 
 #[test]
 fn cli_snapshot() {
- let mut isolate =
- deno::Isolate::new(deno::StartupData::Snapshot(CLI_SNAPSHOT), false);
- deno::js_check(isolate.execute(
+ let mut isolate = deno_core::Isolate::new(
+ deno_core::StartupData::Snapshot(CLI_SNAPSHOT),
+ false,
+ );
+ deno_core::js_check(isolate.execute(
  "<anon>",
  r#"
  if (!window) {
@@ -43,9 +45,11 @@ fn cli_snapshot() {
 
 #[test]
 fn compiler_snapshot() {
- let mut isolate =
- deno::Isolate::new(deno::StartupData::Snapshot(COMPILER_SNAPSHOT), false);
- deno::js_check(isolate.execute(
+ let mut isolate = deno_core::Isolate::new(
+ deno_core::StartupData::Snapshot(COMPILER_SNAPSHOT),
+ false,
+ );
+ deno_core::js_check(isolate.execute(
  "<anon>",
  r#"
  if (!compilerMain) {

cli/lib.rs

@@ -7,7 +7,7 @@ extern crate futures;
 #[macro_use]
 extern crate serde_json;
 extern crate clap;
-extern crate deno;
+extern crate deno_core;
 extern crate indexmap;
 #[cfg(unix)]
 extern crate nix;
@@ -58,9 +58,9 @@ use crate::ops::io::get_stdio;
 use crate::progress::Progress;
 use crate::state::ThreadSafeState;
 use crate::worker::Worker;
-use deno::v8_set_flags;
-use deno::ErrBox;
-use deno::ModuleSpecifier;
+use deno_core::v8_set_flags;
+use deno_core::ErrBox;
+use deno_core::ModuleSpecifier;
 use flags::DenoFlags;
 use flags::DenoSubcommand;
 use log::Level;

cli/main.rs

@@ -1,5 +1,5 @@
-extern crate deno_cli;
+extern crate deno;
 
 fn main() {
- deno_cli::main();
+ deno::main();
 }

cli/ops/compiler.rs

@@ -4,8 +4,8 @@ use crate::futures::future::try_join_all;
 use crate::msg;
 use crate::ops::json_op;
 use crate::state::ThreadSafeState;
-use deno::Loader;
-use deno::*;
+use deno_core::Loader;
+use deno_core::*;
 
 pub fn init(i: &mut Isolate, s: &ThreadSafeState) {
  i.register_op("cache", s.core_op(json_op(s.stateful_op(op_cache))));

cli/ops/dispatch_json.rs

@@ -1,5 +1,5 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-use deno::*;
+use deno_core::*;
 use futures::future::FutureExt;
 use futures::task::SpawnExt;
 pub use serde_derive::Deserialize;

cli/ops/dispatch_minimal.rs

@@ -7,11 +7,11 @@
 use crate::deno_error::GetErrorKind;
 use crate::msg::ErrorKind;
 use byteorder::{LittleEndian, WriteBytesExt};
-use deno::Buf;
-use deno::CoreOp;
-use deno::ErrBox;
-use deno::Op;
-use deno::PinnedBuf;
+use deno_core::Buf;
+use deno_core::CoreOp;
+use deno_core::ErrBox;
+use deno_core::Op;
+use deno_core::PinnedBuf;
 use futures::future::FutureExt;
 use std::future::Future;
 use std::pin::Pin;

cli/ops/errors.rs

@@ -5,7 +5,7 @@ use crate::ops::json_op;
 use crate::source_maps::get_orig_position;
 use crate::source_maps::CachedMaps;
 use crate::state::ThreadSafeState;
-use deno::*;
+use deno_core::*;
 use std::collections::HashMap;
 
 pub fn init(i: &mut Isolate, s: &ThreadSafeState) {

cli/ops/fetch.rs

@@ -4,7 +4,7 @@ use super::io::StreamResource;
 use crate::http_util::{get_client, HttpBody};
 use crate::ops::json_op;
 use crate::state::ThreadSafeState;
-use deno::*;
+use deno_core::*;
 use futures::future::FutureExt;
 use http::header::HeaderName;
 use http::header::HeaderValue;

cli/ops/files.rs

@@ -7,7 +7,7 @@ use crate::deno_error::ErrorKind;
 use crate::fs as deno_fs;
 use crate::ops::json_op;
 use crate::state::ThreadSafeState;
-use deno::*;
+use deno_core::*;
 use futures::future::FutureExt;
 use std;
 use std::convert::From;

cli/ops/fs.rs

@@ -6,7 +6,7 @@ use crate::deno_error::ErrorKind;
 use crate::fs as deno_fs;
 use crate::ops::json_op;
 use crate::state::ThreadSafeState;
-use deno::*;
+use deno_core::*;
 use remove_dir_all::remove_dir_all;
 use std::convert::From;
 use std::fs;

cli/ops/io.rs

@@ -4,9 +4,9 @@ use crate::deno_error::bad_resource;
 use crate::http_util::HttpBody;
 use crate::ops::minimal_op;
 use crate::state::ThreadSafeState;
-use deno::ErrBox;
-use deno::Resource;
-use deno::*;
+use deno_core::ErrBox;
+use deno_core::Resource;
+use deno_core::*;
 use futures::future::FutureExt;
 use futures::ready;
 use std::future::Future;

cli/ops/net.rs

@@ -5,8 +5,8 @@ use crate::deno_error::bad_resource;
 use crate::ops::json_op;
 use crate::resolve_addr::resolve_addr;
 use crate::state::ThreadSafeState;
-use deno::Resource;
-use deno::*;
+use deno_core::Resource;
+use deno_core::*;
 use futures::future::FutureExt;
 use std;
 use std::convert::From;

cli/ops/os.rs

@@ -6,7 +6,7 @@ use crate::ops::json_op;
 use crate::state::ThreadSafeState;
 use crate::version;
 use atty;
-use deno::*;
+use deno_core::*;
 use std::collections::HashMap;
 use std::env;
 use std::io::{Error, ErrorKind};