fix(ops): circular dependency in deno_ops test (denoland#16809)

DavidDeSimone · Nov 25, 2022 · 8fc62f9 · 8fc62f9
1 parent d80af83
commit 8fc62f9
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 74 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ops/Cargo.toml b/ops/Cargo.toml
@@ -24,7 +24,6 @@ regex.workspace = true
 syn.workspace = true
 
 [dev-dependencies]
-deno_core.workspace = true
 prettyplease = "0.1.21"
 testing_macros = "0.2.7"
 trybuild = "1.0.71"
diff --git a/ops/deno.rs b/ops/deno.rs
@@ -1,4 +1,5 @@
 // Copyright 2018-2022 the Deno authors. All rights reserved. MIT license.
+#![cfg(not(test))]
 
 use proc_macro2::{Span, TokenStream};
 use proc_macro_crate::{crate_name, FoundCrate};

diff --git a/ops/fast_call.rs b/ops/fast_call.rs
@@ -432,7 +432,7 @@ mod tests {
   #[testing_macros::fixture("optimizer_tests/**/*.rs")]
   fn test_fast_call_codegen(input: PathBuf) {
     let update_expected = std::env::var("UPDATE_EXPECTED").is_ok();
-    let core = crate::deno::import();
+    let core = quote!(deno_core);
 
     let source =
       std::fs::read_to_string(&input).expect("Failed to read test file");

diff --git a/ops/lib.rs b/ops/lib.rs
@@ -17,9 +17,6 @@ mod deno;
 mod fast_call;
 mod optimizer;
 
-#[cfg(test)]
-mod tests;
-
 const SCOPE_LIFETIME: &str = "'scope";
 
 /// Add the 'scope lifetime to the function signature.
@@ -60,6 +57,10 @@ impl Op {
 
     let is_async = item.sig.asyncness.is_some() || is_future(&item.sig.output);
     let type_params = exclude_lifetime_params(&item.sig.generics.params);
+
+    #[cfg(test)]
+    let core = quote!(deno_core);
+    #[cfg(not(test))]
     let core = deno::import();
 
     Self {

diff --git a/ops/tests/01_fast_callback_options.rs b/ops/tests/01_fast_callback_options.rs
diff --git a/ops/tests/compile_fail/unsupported.rs b/ops/tests/compile_fail/unsupported.rs
diff --git a/ops/tests/compile_fail/unsupported.stderr b/ops/tests/compile_fail/unsupported.stderr
diff --git a/ops/tests/mod.rs b/ops/tests/mod.rs