From 863976c10fd561dd751aea52854b6787bd767c3c Mon Sep 17 00:00:00 2001 From: Kevin Amado Date: Tue, 1 Feb 2022 19:15:41 -0500 Subject: [PATCH] feat: remove whitespace around dynamic --- flake.nix | 8 ++++---- src/rules/dynamic.rs | 8 ++------ tests/cases/dynamic/out | 2 +- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/flake.nix b/flake.nix index 2a9a990..9c1987e 100644 --- a/flake.nix +++ b/flake.nix @@ -22,15 +22,15 @@ let nixpkgs = import inputs.nixpkgs { inherit system; }; cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml); - treefmt = inputs.treefmt.defaultPackage.${ system }; - fenix = inputs.fenix.packages.${ system }; + treefmt = inputs.treefmt.defaultPackage.${system}; + fenix = inputs.fenix.packages.${system}; fenixPlatform = nixpkgs.makeRustPlatform { inherit (fenix.latest) cargo rustc; }; in { - checks = { defaultPackage = inputs.self.defaultPackage.${ system }; }; + checks = { defaultPackage = inputs.self.defaultPackage.${system}; }; defaultApp = { type = "app"; - program = "${inputs.self.defaultPackage.${ system }}/bin/alejandra"; + program = "${inputs.self.defaultPackage.${system}}/bin/alejandra"; }; defaultPackage = fenixPlatform.buildRustPackage diff --git a/src/rules/dynamic.rs b/src/rules/dynamic.rs index c4cf3a1..e3ab4cc 100644 --- a/src/rules/dynamic.rs +++ b/src/rules/dynamic.rs @@ -21,9 +21,7 @@ pub fn rule( steps.push_back(crate::builder::Step::NewLine); steps.push_back(crate::builder::Step::Pad); } - crate::config::Layout::Wide => { - steps.push_back(crate::builder::Step::Whitespace); - } + crate::config::Layout::Wide => {} } // /**/ @@ -59,9 +57,7 @@ pub fn rule( steps.push_back(crate::builder::Step::NewLine); steps.push_back(crate::builder::Step::Pad); } - crate::config::Layout::Wide => { - steps.push_back(crate::builder::Step::Whitespace); - } + crate::config::Layout::Wide => {} } steps.push_back(crate::builder::Step::Format(child.element)); diff --git a/tests/cases/dynamic/out b/tests/cases/dynamic/out index 6f74b7d..5eb8cec 100644 --- a/tests/cases/dynamic/out +++ b/tests/cases/dynamic/out @@ -8,7 +8,7 @@ a /* d */ - e.${ f } + e.${f} } /* g