From 701931477c302c0fc9dbec529af5a16c198650aa Mon Sep 17 00:00:00 2001 From: Matt Mastracci Date: Mon, 18 Sep 2023 09:39:39 -0600 Subject: [PATCH] fix(cli): fetch works in Jupyter (#20552) An op2 needs to be overloaded by an op2, not an op1. --- cli/tools/jupyter/mod.rs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/cli/tools/jupyter/mod.rs b/cli/tools/jupyter/mod.rs index b704d58cd5..7d7104060e 100644 --- a/cli/tools/jupyter/mod.rs +++ b/cli/tools/jupyter/mod.rs @@ -8,7 +8,7 @@ use crate::CliFactory; use deno_core::anyhow::Context; use deno_core::error::AnyError; use deno_core::futures::channel::mpsc; -use deno_core::op; +use deno_core::op2; use deno_core::resolve_url_or_path; use deno_core::serde::Deserialize; use deno_core::serde_json; @@ -105,22 +105,25 @@ deno_core::extension!(deno_jupyter, }, ); -#[op] +#[op2(fast)] pub fn op_print( state: &mut OpState, - msg: String, + #[string] msg: &str, is_err: bool, ) -> Result<(), AnyError> { let sender = state.borrow_mut::>(); if is_err { - if let Err(err) = sender.unbounded_send(server::StdioMsg::Stderr(msg)) { + if let Err(err) = + sender.unbounded_send(server::StdioMsg::Stderr(msg.into())) + { eprintln!("Failed to send stderr message: {}", err); } return Ok(()); } - if let Err(err) = sender.unbounded_send(server::StdioMsg::Stdout(msg)) { + if let Err(err) = sender.unbounded_send(server::StdioMsg::Stdout(msg.into())) + { eprintln!("Failed to send stdout message: {}", err); } Ok(())