summaryrefslogtreecommitdiff
path: root/cli
diff options
context:
space:
mode:
authorDivy Srivastava <dj.srivastava23@gmail.com>2024-04-13 01:15:38 +0530
committerGitHub <noreply@github.com>2024-04-12 21:45:38 +0200
commitc56f2e0fc04f12d3a69c1892d8866323995f3be4 (patch)
treef7bb0d74b09e0627bd21028b7a1f9ff71ed1d136 /cli
parent4b62cb54dd135dce494dfe9ddadb87143caf8aa4 (diff)
chore: upgrade deno_core to 0.274.0 (#23344)
Signed-off-by: Divy Srivastava <dj.srivastava23@gmail.com>
Diffstat (limited to 'cli')
-rw-r--r--cli/lsp/tsc.rs10
-rw-r--r--cli/ops/jupyter.rs3
-rw-r--r--cli/tsc/mod.rs48
3 files changed, 49 insertions, 12 deletions
diff --git a/cli/lsp/tsc.rs b/cli/lsp/tsc.rs
index 2aac251d3..c77da221c 100644
--- a/cli/lsp/tsc.rs
+++ b/cli/lsp/tsc.rs
@@ -4037,6 +4037,14 @@ fn op_resolve(
state: &mut OpState,
#[serde] args: ResolveArgs,
) -> Result<Vec<Option<(String, String)>>, AnyError> {
+ op_resolve_inner(state, args)
+}
+
+#[inline]
+fn op_resolve_inner(
+ state: &mut OpState,
+ args: ResolveArgs,
+) -> Result<Vec<Option<(String, String)>>, AnyError> {
let state = state.borrow_mut::<State>();
let mark = state.performance.mark_with_args("tsc.op.op_resolve", &args);
let referrer = state.specifier_map.normalize(&args.base)?;
@@ -5585,7 +5593,7 @@ mod tests {
)
.await;
let mut state = setup_op_state(snapshot);
- let resolved = op_resolve::call(
+ let resolved = op_resolve_inner(
&mut state,
ResolveArgs {
base: "file:///a.ts".to_string(),
diff --git a/cli/ops/jupyter.rs b/cli/ops/jupyter.rs
index 56bbf7171..1d727c33f 100644
--- a/cli/ops/jupyter.rs
+++ b/cli/ops/jupyter.rs
@@ -10,7 +10,6 @@ use crate::tools::jupyter::server::StdioMsg;
use deno_core::error::AnyError;
use deno_core::op2;
use deno_core::serde_json;
-use deno_core::Op;
use deno_core::OpState;
use tokio::sync::mpsc;
use tokio::sync::Mutex;
@@ -23,7 +22,7 @@ deno_core::extension!(deno_jupyter,
sender: mpsc::UnboundedSender<StdioMsg>,
},
middleware = |op| match op.name {
- "op_print" => op_print::DECL,
+ "op_print" => op_print(),
_ => op,
},
state = |state, options| {
diff --git a/cli/tsc/mod.rs b/cli/tsc/mod.rs
index 383ed1291..2d06e0a95 100644
--- a/cli/tsc/mod.rs
+++ b/cli/tsc/mod.rs
@@ -393,6 +393,11 @@ fn normalize_specifier(
#[op2]
#[string]
fn op_create_hash(s: &mut OpState, #[string] text: &str) -> String {
+ op_create_hash_inner(s, text)
+}
+
+#[inline]
+fn op_create_hash_inner(s: &mut OpState, text: &str) -> String {
let state = s.borrow_mut::<State>();
get_hash(text, state.hash_data)
}
@@ -409,6 +414,11 @@ struct EmitArgs {
#[op2]
fn op_emit(state: &mut OpState, #[serde] args: EmitArgs) -> bool {
+ op_emit_inner(state, args)
+}
+
+#[inline]
+fn op_emit_inner(state: &mut OpState, args: EmitArgs) -> bool {
let state = state.borrow_mut::<State>();
match args.file_name.as_ref() {
"internal:///.tsbuildinfo" => state.maybe_tsbuildinfo = Some(args.data),
@@ -460,6 +470,13 @@ fn op_load(
state: &mut OpState,
#[string] load_specifier: &str,
) -> Result<Option<LoadResponse>, AnyError> {
+ op_load_inner(state, load_specifier)
+}
+
+fn op_load_inner(
+ state: &mut OpState,
+ load_specifier: &str,
+) -> Result<Option<LoadResponse>, AnyError> {
let state = state.borrow_mut::<State>();
let specifier = normalize_specifier(load_specifier, &state.current_dir)
@@ -562,6 +579,14 @@ fn op_resolve(
state: &mut OpState,
#[serde] args: ResolveArgs,
) -> Result<Vec<(String, String)>, AnyError> {
+ op_resolve_inner(state, args)
+}
+
+#[inline]
+fn op_resolve_inner(
+ state: &mut OpState,
+ args: ResolveArgs,
+) -> Result<Vec<(String, String)>, AnyError> {
let state = state.borrow_mut::<State>();
let mut resolved: Vec<(String, String)> =
Vec::with_capacity(args.specifiers.len());
@@ -779,6 +804,11 @@ struct RespondArgs {
// Can't we use something more efficient here?
#[op2]
fn op_respond(state: &mut OpState, #[serde] args: RespondArgs) {
+ op_respond_inner(state, args)
+}
+
+#[inline]
+fn op_respond_inner(state: &mut OpState, args: RespondArgs) {
let state = state.borrow_mut::<State>();
state.maybe_response = Some(args);
}
@@ -1022,7 +1052,7 @@ mod tests {
#[tokio::test]
async fn test_create_hash() {
let mut state = setup(None, Some(123), None).await;
- let actual = op_create_hash::call(&mut state, "some sort of content");
+ let actual = op_create_hash_inner(&mut state, "some sort of content");
assert_eq!(actual, "11905938177474799758");
}
@@ -1038,7 +1068,7 @@ mod tests {
#[tokio::test]
async fn test_emit_tsbuildinfo() {
let mut state = setup(None, None, None).await;
- let actual = op_emit::call(
+ let actual = op_emit_inner(
&mut state,
EmitArgs {
data: "some file content".to_string(),
@@ -1062,7 +1092,7 @@ mod tests {
)
.await;
let actual =
- op_load::call(&mut state, "https://deno.land/x/mod.ts").unwrap();
+ op_load_inner(&mut state, "https://deno.land/x/mod.ts").unwrap();
assert_eq!(
serde_json::to_value(actual).unwrap(),
json!({
@@ -1081,7 +1111,7 @@ mod tests {
Some("some content".to_string()),
)
.await;
- let actual = op_load::call(&mut state, "asset:///lib.dom.d.ts")
+ let actual = op_load_inner(&mut state, "asset:///lib.dom.d.ts")
.expect("should have invoked op")
.expect("load should have succeeded");
let expected = get_lazily_loaded_asset("lib.dom.d.ts").unwrap();
@@ -1098,7 +1128,7 @@ mod tests {
Some("some content".to_string()),
)
.await;
- let actual = op_load::call(&mut state, "internal:///.tsbuildinfo")
+ let actual = op_load_inner(&mut state, "internal:///.tsbuildinfo")
.expect("should have invoked op")
.expect("load should have succeeded");
assert_eq!(
@@ -1114,7 +1144,7 @@ mod tests {
#[tokio::test]
async fn test_load_missing_specifier() {
let mut state = setup(None, None, None).await;
- let actual = op_load::call(&mut state, "https://deno.land/x/mod.ts")
+ let actual = op_load_inner(&mut state, "https://deno.land/x/mod.ts")
.expect("should have invoked op");
assert_eq!(serde_json::to_value(actual).unwrap(), json!(null));
}
@@ -1127,7 +1157,7 @@ mod tests {
None,
)
.await;
- let actual = op_resolve::call(
+ let actual = op_resolve_inner(
&mut state,
ResolveArgs {
base: "https://deno.land/x/a.ts".to_string(),
@@ -1149,7 +1179,7 @@ mod tests {
None,
)
.await;
- let actual = op_resolve::call(
+ let actual = op_resolve_inner(
&mut state,
ResolveArgs {
base: "https://deno.land/x/a.ts".to_string(),
@@ -1177,7 +1207,7 @@ mod tests {
"stats": [["a", 12]]
}))
.unwrap();
- op_respond::call(&mut state, args);
+ op_respond_inner(&mut state, args);
let state = state.borrow::<State>();
assert_eq!(
state.maybe_response,