diff options
Diffstat (limited to 'cli/tools/jupyter')
-rw-r--r-- | cli/tools/jupyter/install.rs | 2 | ||||
-rw-r--r-- | cli/tools/jupyter/mod.rs | 4 | ||||
-rw-r--r-- | cli/tools/jupyter/server.rs | 31 |
3 files changed, 18 insertions, 19 deletions
diff --git a/cli/tools/jupyter/install.rs b/cli/tools/jupyter/install.rs index 40f21d3c1..b0ddc948d 100644 --- a/cli/tools/jupyter/install.rs +++ b/cli/tools/jupyter/install.rs @@ -7,7 +7,7 @@ use std::env::current_exe; use std::io::Write; use std::path::Path; -use runtimelib::dirs::user_data_dir; +use jupyter_runtime::dirs::user_data_dir; const DENO_ICON_32: &[u8] = include_bytes!("./resources/deno-logo-32x32.png"); const DENO_ICON_64: &[u8] = include_bytes!("./resources/deno-logo-64x64.png"); diff --git a/cli/tools/jupyter/mod.rs b/cli/tools/jupyter/mod.rs index a4d0bb27d..4b5009ba7 100644 --- a/cli/tools/jupyter/mod.rs +++ b/cli/tools/jupyter/mod.rs @@ -23,8 +23,8 @@ use deno_runtime::permissions::PermissionsContainer; use deno_runtime::WorkerExecutionMode; use deno_terminal::colors; -use runtimelib::jupyter::ConnectionInfo; -use runtimelib::messaging::StreamContent; +use jupyter_runtime::jupyter::ConnectionInfo; +use jupyter_runtime::messaging::StreamContent; use tokio::sync::mpsc; use tokio::sync::mpsc::UnboundedSender; diff --git a/cli/tools/jupyter/server.rs b/cli/tools/jupyter/server.rs index 3d273ee74..36f4d5c18 100644 --- a/cli/tools/jupyter/server.rs +++ b/cli/tools/jupyter/server.rs @@ -19,19 +19,18 @@ use deno_core::CancelHandle; use tokio::sync::mpsc; use tokio::sync::Mutex; -use runtimelib::ConnectionInfo; -use runtimelib::KernelControlConnection; -use runtimelib::KernelHeartbeatConnection; -use runtimelib::KernelIoPubConnection; -use runtimelib::KernelShellConnection; - -use runtimelib::messaging; -use runtimelib::AsChildOf; -use runtimelib::JupyterMessage; -use runtimelib::JupyterMessageContent; -use runtimelib::ReplyError; -use runtimelib::ReplyStatus; -use runtimelib::StreamContent; +use jupyter_runtime::messaging; +use jupyter_runtime::AsChildOf; +use jupyter_runtime::ConnectionInfo; +use jupyter_runtime::JupyterMessage; +use jupyter_runtime::JupyterMessageContent; +use jupyter_runtime::KernelControlConnection; +use jupyter_runtime::KernelHeartbeatConnection; +use jupyter_runtime::KernelIoPubConnection; +use jupyter_runtime::KernelShellConnection; +use jupyter_runtime::ReplyError; +use jupyter_runtime::ReplyStatus; +use jupyter_runtime::StreamContent; pub struct JupyterServer { execution_count: usize, @@ -455,7 +454,7 @@ impl JupyterServer { messaging::ExecuteReply { execution_count: self.execution_count, status: ReplyStatus::Error, - payload: None, + payload: Default::default(), user_expressions: None, error: None, } @@ -481,7 +480,7 @@ impl JupyterServer { execution_count: self.execution_count, status: ReplyStatus::Ok, user_expressions: None, - payload: None, + payload: Default::default(), error: None, } .as_child_of(parent_message), @@ -586,7 +585,7 @@ impl JupyterServer { traceback, }), user_expressions: None, - payload: None, + payload: Default::default(), } .as_child_of(parent_message), ) |