From f16ac2bdf09ca1bf4fce5fb9563078744d3ddd73 Mon Sep 17 00:00:00 2001 From: Fuwn Date: Wed, 17 May 2023 02:04:21 -0700 Subject: chore(tasks): simplify formatter --- Makefile.toml | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/Makefile.toml b/Makefile.toml index c6b5a2e..f900f33 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -1,26 +1,14 @@ [config] default_to_workspace = false -[tasks.fmt] -script_runner = "python" -script_extension = "py" -script = ''' -import glob -import subprocess - -rustfmt_arguments = [ - "rustfmt", - "--unstable-features", - "--skip-children", - "./build.rs" -] +[env] +CARGO_MAKE_EXTEND_WORKSPACE_MAKEFILE = true -rustfmt_arguments.extend(glob.glob("./src/**/*.rs", recursive=True)) -rustfmt_arguments.extend(glob.glob("./amenadiel/**/*.rs", recursive=True)) - -subprocess.run(rustfmt_arguments, shell=True) -''' +[tasks.fmt] +args = ["fmt"] +command = "cargo" toolchain = "nightly" +workspace = true [tasks.check] args = ["check", "--all-features"] -- cgit v1.2.3