foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-21 15:04:11 -05:00
Code Issues Packages 1 Wiki Activity

upgrade zeromq and runtimelib

Browse source
This commit is contained in:
Ryan Dahl 2024-07-26 09:18:12 -04:00
parent 7776636c2e
commit 1cdb3e8161
6 changed files with 439 additions and 402 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

818
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

2
Cargo.toml
View file

@ -191,7 +191,7 @@ url = { version = "< 2.5.0", features = ["serde", "expose_internals"] }
uuid = { version = "1.3.0", features = ["v4"] } uuid = { version = "1.3.0", features = ["v4"] }
webpki-roots = "0.26" webpki-roots = "0.26"
which = "4.2.5" which = "4.2.5"
zeromq = { version = "=0.3.4", default-features = false, features = ["tcp-transport", "tokio-runtime"] } zeromq = { version = "=0.4.0", default-features = false, features = ["tcp-transport", "tokio-runtime"] }
zstd = "=0.12.4" zstd = "=0.12.4"
# crypto # crypto

2
cli/Cargo.toml
View file

@ -116,7 +116,7 @@ hyper-util.workspace = true
import_map = { version = "=0.20.0", features = ["ext"] } import_map = { version = "=0.20.0", features = ["ext"] }
indexmap.workspace = true indexmap.workspace = true
jsonc-parser.workspace = true jsonc-parser.workspace = true
jupyter_runtime = { package = "runtimelib", version = "=0.11.0" } jupyter_runtime = { package = "runtimelib", version = "=0.13.0" }
lazy-regex.workspace = true lazy-regex.workspace = true
libc.workspace = true libc.workspace = true
libz-sys.workspace = true libz-sys.workspace = true

3
cli/ops/jupyter.rs
View file

@ -69,8 +69,7 @@ pub fn op_jupyter_input(
InputRequest { InputRequest {
prompt, prompt,
password: is_password, password: is_password,
} },
.into(),
Some(&last_request), Some(&last_request),
); );

2
cli/tools/jupyter/mod.rs
View file

@ -126,7 +126,7 @@ pub async fn kernel(
self self
.0 .0
.send(StreamContent::stdout( .send(StreamContent::stdout(
String::from_utf8_lossy(buf).into_owned(), &String::from_utf8_lossy(buf),
)) ))
.ok(); .ok();
Ok(buf.len()) Ok(buf.len())

14
cli/tools/jupyter/server.rs
View file

@ -24,8 +24,8 @@ use tokio::sync::mpsc;
use tokio::sync::oneshot; use tokio::sync::oneshot;
use jupyter_runtime::messaging; use jupyter_runtime::messaging;
use jupyter_runtime::AsChildOf;
use jupyter_runtime::ConnectionInfo; use jupyter_runtime::ConnectionInfo;
use jupyter_runtime::ExecutionCount;
use jupyter_runtime::JupyterMessage; use jupyter_runtime::JupyterMessage;
use jupyter_runtime::JupyterMessageContent; use jupyter_runtime::JupyterMessageContent;
use jupyter_runtime::KernelControlConnection; use jupyter_runtime::KernelControlConnection;
@ -475,7 +475,7 @@ impl JupyterServer {
self self
.send_iopub( .send_iopub(
messaging::ExecuteInput { messaging::ExecuteInput {
execution_count: self.execution_count, execution_count: ExecutionCount(self.execution_count),
code: execute_request.code.clone(), code: execute_request.code.clone(),
} }
.as_child_of(parent_message), .as_child_of(parent_message),
@ -503,7 +503,7 @@ impl JupyterServer {
connection connection
.send( .send(
messaging::ExecuteReply { messaging::ExecuteReply {
execution_count: self.execution_count, execution_count: ExecutionCount(self.execution_count),
status: ReplyStatus::Error, status: ReplyStatus::Error,
payload: Default::default(), payload: Default::default(),
user_expressions: None, user_expressions: None,
@ -532,7 +532,7 @@ impl JupyterServer {
connection connection
.send( .send(
messaging::ExecuteReply { messaging::ExecuteReply {
execution_count: self.execution_count, execution_count: ExecutionCount(self.execution_count),
status: ReplyStatus::Ok, status: ReplyStatus::Ok,
user_expressions: None, user_expressions: None,
payload: Default::default(), payload: Default::default(),
@ -632,13 +632,13 @@ impl JupyterServer {
connection connection
.send( .send(
messaging::ExecuteReply { messaging::ExecuteReply {
execution_count: self.execution_count, execution_count: ExecutionCount(self.execution_count),
status: ReplyStatus::Error, status: ReplyStatus::Error,
error: Some(ReplyError { error: Some(Box::new(ReplyError {
ename, ename,
evalue, evalue,
traceback, traceback,
}), })),
user_expressions: None, user_expressions: None,
payload: Default::default(), payload: Default::default(),
} }