From aabf8aadf8430dc382be10604192475b11126105 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Fri, 7 Mar 2025 21:32:05 -0700
Subject: [PATCH] [fontations] Use proper meson function for running commands

---
 meson.build                |  6 ------
 src/fontations/meson.build | 23 +++++------------------
 2 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/meson.build b/meson.build
index bdc680f63..4ca64243a 100644
--- a/meson.build
+++ b/meson.build
@@ -462,12 +462,6 @@ configure_file(output: 'config.h', configuration: conf)
 
 alias_target('lib', libharfbuzz)
 alias_target('libs', libharfbuzz, libharfbuzz_subset)
-if get_option('fontations').enabled()
-  alias_target('clippy', clippy)
-  alias_target('clippy-check', clippy_check)
-  alias_target('fmt', fmt)
-  alias_target('fmt-check', fmt_check)
-endif
 
 if meson.version().version_compare('>=0.57.0')
   # Re glib, see https://github.com/harfbuzz/harfbuzz/issues/4153#issuecomment-2646347531
diff --git a/src/fontations/meson.build b/src/fontations/meson.build
index 6d1d6a315..29ade709f 100644
--- a/src/fontations/meson.build
+++ b/src/fontations/meson.build
@@ -8,7 +8,6 @@ hb_rs = rust.bindgen(
           '--allowlist-type=hb_.*',
           '--no-copy=hb_.*',
           ],
-  #args : ['--no-rustfmt-bindings'],
 )
 
 cargo = find_program('cargo')
@@ -53,26 +52,20 @@ harfbuzz_fontations_dep = declare_dependency(
   link_whole: harfbuzz_fontations,
 )
 
-clippy = custom_target(
+clippy = run_target(
   'clippy',
-  input: 'lib.rs',
-  output: 'clippy',
-  depends: [hb_rs],
   env: ['OUT_DIR=' + meson.current_build_dir()],
   command: [
     cargo, 'clippy',
-    ] + cargo_args + [
     '--allow-dirty', '--fix',
+    ] + cargo_args + [
     '--lib', '-p', 'harfbuzz_fontations',
     '--target-dir', meson.current_build_dir(),
     '--manifest-path', meson.current_source_dir() / 'Cargo.toml',
   ],
 )
-clippy_check = custom_target(
+clippy_check = run_target(
   'clippy-check',
-  input: 'lib.rs',
-  output: 'clippy-check',
-  depends: [hb_rs],
   env: ['OUT_DIR=' + meson.current_build_dir()],
   command: [
     cargo, 'clippy',
@@ -84,11 +77,8 @@ clippy_check = custom_target(
   ],
 )
 
-fmt = custom_target(
+fmt = run_target(
   'fmt',
-  input: 'lib.rs',
-  output: 'fmt',
-  depends: [hb_rs],
   env: ['OUT_DIR=' + meson.current_build_dir()],
   command: [
     rustfmt,
@@ -97,11 +87,8 @@ fmt = custom_target(
     meson.current_source_dir() / 'lib.rs',
   ],
 )
-fmt_check = custom_target(
+fmt_check = run_target(
   'fmt-check',
-  input: 'lib.rs',
-  output: 'fmt-check',
-  depends: [hb_rs],
   env: ['OUT_DIR=' + meson.current_build_dir()],
   command: [
     rustfmt,