refactor: adopt RustQ 0.10.0

Author: dannote

mix.exs

@@ -76,7 +76,7 @@ defmodule OXC.MixProject do
     [
       {:rustler, "~> 0.36 or ~> 0.37 or ~> 0.38", optional: true},
       {:rustler_precompiled, "~> 0.8"},
-      {:rustq, "~> 0.9.11", only: [:dev, :test], runtime: false},
+      {:rustq, "~> 0.10.0", only: [:dev, :test], runtime: false},
       {:ex_doc, "~> 0.35", only: :dev, runtime: false},
       {:dialyxir, "~> 1.4", only: [:dev, :test], runtime: false},
       {:credo, "~> 1.7", only: [:dev, :test], runtime: false},

mix.lock

@@ -21,7 +21,7 @@
   "reach": {:hex, :reach, "2.5.0", "c6b2116d0bab5454597479e7b0b6bc224fb3a262b9e15bb16877b4fdd42c3ada", [:mix], [{:boxart, "~> 0.3.3", [hex: :boxart, repo: "hexpm", optional: true]}, {:ex_ast, "~> 0.12.0", [hex: :ex_ast, repo: "hexpm", optional: false]}, {:ex_dna, "~> 1.5", [hex: :ex_dna, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:libgraph, "~> 0.16.0", [hex: :libgraph, repo: "hexpm", optional: false]}, {:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: true]}, {:makeup_elixir, "~> 1.0", [hex: :makeup_elixir, repo: "hexpm", optional: true]}, {:makeup_js, "~> 0.1", [hex: :makeup_js, repo: "hexpm", optional: true]}, {:quickbeam, "~> 0.10", [hex: :quickbeam, repo: "hexpm", optional: true]}], "hexpm", "b7fa8a1b5b8a1a55b16a0063ddbcedc63b747423b1cf4c26671919c3f56bbaf3"},
   "rustler": {:hex, :rustler, "0.38.0", "7a8906998ff0d28e3021c0a73264abcda719bda344b2e58307c6805b0f87c9b4", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "704c03c1bf66be12b031c5a389347b91c81c5cb819a24b068b0de36fe4a5652a"},
   "rustler_precompiled": {:hex, :rustler_precompiled, "0.8.4", "700a878312acfac79fb6c572bb8b57f5aae05fe1cf70d34b5974850bbf2c05bf", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: false]}, {:rustler, "~> 0.23", [hex: :rustler, repo: "hexpm", optional: true]}], "hexpm", "3b33d99b540b15f142ba47944f7a163a25069f6d608783c321029bc1ffb09514"},
-  "rustq": {:hex, :rustq, "0.9.11", "ffe15ea7e2560068d8d25d4b20639989b5ea055fb59a8e0932f57988998bc7a4", [:mix], [{:json_codec, "~> 0.1", [hex: :json_codec, repo: "hexpm", optional: false]}, {:nimble_options, "~> 1.1", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:reach, "~> 2.0", [hex: :reach, repo: "hexpm", optional: false]}, {:rustler, "~> 0.37", [hex: :rustler, repo: "hexpm", optional: false]}], "hexpm", "a303c480991b8b4f13f160b300a5219b45d5ae72965de0ed82cd2dea3e078677"},
+  "rustq": {:hex, :rustq, "0.10.0", "c2fcc6a037a53d554ff7281db47d5b20e815f51ca016ab4f53599def19e56280", [:mix], [{:json_codec, "~> 0.1", [hex: :json_codec, repo: "hexpm", optional: false]}, {:nimble_options, "~> 1.1", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:reach, "~> 2.0", [hex: :reach, repo: "hexpm", optional: false]}, {:rustler, "~> 0.37", [hex: :rustler, repo: "hexpm", optional: false]}], "hexpm", "1c95a46d5f8636d4538569ef0bc1917622c47a7c3fe17ee852ff204d8503366f"},
   "sourceror": {:hex, :sourceror, "1.12.0", "da354c5f35aad3cc1132f5d5b0d8437d865e2661c263260480bab51b5eedb437", [:mix], [], "hexpm", "755703683bd014ebcd5de9acc24b68fb874a660a568d1d63f8f98cd8a6ef9cd0"},
   "toml": {:hex, :toml, "0.7.0", "fbcd773caa937d0c7a02c301a1feea25612720ac3fa1ccb8bfd9d30d822911de", [:mix], [], "hexpm", "0690246a2478c1defd100b0c9b89b4ea280a22be9a7b313a8a058a2408a2fa70"},
 }

rustq.exs

@@ -1,6 +1,6 @@
 use RustQ.Config
 
-alias RustQ.{Rust, Rustler}
+alias RustQ.Rustler.{Atom, Nif, Term}
 
 codegen_atom_sources = [
   "native/oxc_ex_nif/src/codegen.rs",
@@ -32,11 +32,11 @@ codegen_atoms =
   end)
 
 rust :codegen_atoms, "native/oxc_ex_nif/src/generated_codegen_atoms.rs" do
-  Rustler.atoms(codegen_atoms, module: false)
+  Atom.declaration(codegen_atoms, module: false)
 end
 
 rust "native/oxc_ex_nif/src/generated_atoms.rs" do
-  Rustler.atoms([
+  Atom.declaration([
     :ok,
     :error,
     {:atom_static, "static"},
@@ -104,11 +104,11 @@ rust "native/oxc_ex_nif/src/generated_atoms.rs" do
 end
 
 rust "native/oxc_lint_nif/src/generated_atoms.rs" do
-  Rustler.atoms([:ok, :error, :warn, :deny, :allow])
+  Atom.declaration([:ok, :error, :warn, :deny, :allow])
 end
 
 rust "native/oxc_fmt_nif/src/generated_atoms.rs" do
-  Rustler.atoms([
+  Atom.declaration([
     :ok,
     :error,
     :print_width,
@@ -147,20 +147,20 @@ rust "native/oxc_fmt_nif/src/generated_atoms.rs" do
 end
 
 rust "native/oxc_fmt_nif/src/generated_option_helpers.rs" do
-  Rustler.term_helpers(include: [:get, :get_bool, :get_i64, :get_string, :get_string_list, :get_map])
+  Term.helpers(include: [:get, :get_bool, :get_i64, :get_string, :get_string_list, :get_map])
 end
 
-type_key = Rust.path([:a, "r#type"]) <> "()"
+type_key = "a::r#type()"
 
 rust "native/oxc_ex_nif/src/generated_term_helpers.rs" do
-  Rustler.term_helpers(
+  Term.helpers(
     type_key: type_key,
     include: [:get, :is_nil, :opt, :str_val, :bool_val, :f64_val, :list_val, :type_atom, :type_eq, :type_str]
   )
 end
 
 rust "native/oxc_ex_nif/src/generated_option_helpers.rs" do
-  Rustler.term_helpers(
+  Term.helpers(
     include: [
       :get,
       :is_nil,
@@ -174,13 +174,13 @@ rust "native/oxc_ex_nif/src/generated_option_helpers.rs" do
 end
 
 rust "native/oxc_ex_nif/src/generated_ast_decoders.rs" do
-  Rustler.term_decoder(:ProgramInput,
+  Term.decoder(:ProgramInput,
     fields: [
       body: [type: {:vec, "Term<'a>"}, key: "a::body()", required: true]
     ]
   )
 
-  Rustler.term_decoder(:IfStatementInput,
+  Term.decoder(:IfStatementInput,
     result: "R",
     fields: [
       test: [type: "Term<'a>", key: "a::test()", required: true],
@@ -191,60 +191,43 @@ rust "native/oxc_ex_nif/src/generated_ast_decoders.rs" do
 end
 
 fmt_source = "native/oxc_fmt_nif/src/lib.rs"
-fmt_nifs = [format: [lifetime: :a]]
+fmt_nifs = [format: []]
 
 rust :fmt_nifs, "native/oxc_fmt_nif/src/generated_nifs.rs" do
-  Rustler.nif_exports_from_source(fmt_source, fmt_nifs, schedule: :dirty_cpu)
+  Nif.wrappers_from_source(fmt_source, fmt_nifs, schedule: :dirty_cpu)
 end
 
 generate :fmt_native_stubs, "lib/oxc/format/native/generated_stubs.ex" do
   build(fn ->
-    Rustler.nif_stubs_from_source(fmt_source, fmt_nifs, OXC.Format.Native.GeneratedStubs)
+    Nif.stubs_from_source(fmt_source, fmt_nifs, OXC.Format.Native.GeneratedStubs)
   end)
 end
 
 lint_source = "native/oxc_lint_nif/src/lib.rs"
-lint_nifs = [lint: [lifetime: :a]]
+lint_nifs = [lint: []]
 
 rust :lint_nifs, "native/oxc_lint_nif/src/generated_nifs.rs" do
-  Rustler.nif_exports_from_source(lint_source, lint_nifs, schedule: :dirty_cpu)
+  Nif.wrappers_from_source(lint_source, lint_nifs, schedule: :dirty_cpu)
 end
 
 generate :lint_native_stubs, "lib/oxc/lint/native/generated_stubs.ex" do
   build(fn ->
-    Rustler.nif_stubs_from_source(lint_source, lint_nifs, OXC.Lint.Native.GeneratedStubs)
+    Nif.stubs_from_source(lint_source, lint_nifs, OXC.Lint.Native.GeneratedStubs)
   end)
 end
 
 native_nif_groups = [
-  {"native/oxc_ex_nif/src/parse.rs",
-   [parse: [lifetime: :a], valid: [], transform: [lifetime: :a], minify: [lifetime: :a]]},
-  {"native/oxc_ex_nif/src/bundle.rs",
-   [bundle: [lifetime: :a], bundle_entry: [lifetime: :a], bundle_run: [lifetime: :a]]},
-  {"native/oxc_ex_nif/src/imports.rs", [select: [lifetime: :a]]},
-  {"native/oxc_ex_nif/src/transform_many.rs", [transform_many: [lifetime: :a]]},
-  {"native/oxc_ex_nif/src/codegen.rs", [codegen: [lifetime: :a]]}
+  {"native/oxc_ex_nif/src/parse.rs", [parse: [], valid: [], transform: [], minify: []]},
+  {"native/oxc_ex_nif/src/bundle.rs", [bundle: [], bundle_entry: [], bundle_run: []]},
+  {"native/oxc_ex_nif/src/imports.rs", [select: []]},
+  {"native/oxc_ex_nif/src/transform_many.rs", [transform_many: []]},
+  {"native/oxc_ex_nif/src/codegen.rs", [codegen: []]}
 ]
 
-native_nif_functions =
-  Enum.flat_map(native_nif_groups, fn {source, nifs} ->
-    metadata = source |> RustQ.Syn.parse_file!() |> RustQ.Syn.functions()
-
-    Enum.map(nifs, fn {name, _opts} ->
-      implementation = "#{name}_impl"
-      function = Enum.find(metadata, &(&1.name == implementation))
-
-      function || raise ArgumentError, "NIF implementation #{implementation} not found in #{source}"
-      {name, function}
-    end)
-  end)
-
 rust :native_nifs, "native/oxc_ex_nif/src/generated_nifs.rs" do
-  Enum.flat_map(native_nif_groups, fn {source, nifs} ->
-    Rustler.nif_exports_from_source(source, nifs, schedule: :dirty_cpu)
-  end)
+  Nif.wrappers_from_sources(native_nif_groups, schedule: :dirty_cpu)
 end
 
 generate :native_stubs, "lib/oxc/native/generated_stubs.ex" do
-  content(Rustler.nif_stubs_from_functions(native_nif_functions, OXC.Native.GeneratedStubs))
+  content(Nif.stubs_from_sources(native_nif_groups, OXC.Native.GeneratedStubs))
 end