From 1cad733ff245dfb1cf43b6114155535e29245bed Mon Sep 17 00:00:00 2001 From: Tom Bereknyei Date: Wed, 2 Feb 2022 01:55:14 -0500 Subject: [PATCH] lambda: keep on same line Fixes #29 --- flake.nix | 6 ++---- src/rules/lambda.rs | 3 +-- tests/cases/lambda/out | 9 +++------ 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/flake.nix b/flake.nix index 1b28b6a..feb3ff4 100644 --- a/flake.nix +++ b/flake.nix @@ -14,10 +14,8 @@ treefmt.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = - inputs: - inputs.flakeUtils.lib.eachSystem [ "x86_64-darwin" "x86_64-linux" ] ( - system: - let + inputs: inputs.flakeUtils.lib.eachSystem [ "x86_64-darwin" "x86_64-linux" ] ( + system: let nixpkgs = import inputs.nixpkgs { inherit system; }; cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml); treefmt = inputs.treefmt.defaultPackage.${system}; diff --git a/src/rules/lambda.rs b/src/rules/lambda.rs index 593cd71..59a24c1 100644 --- a/src/rules/lambda.rs +++ b/src/rules/lambda.rs @@ -84,8 +84,7 @@ pub fn rule( { steps.push_back(crate::builder::Step::Whitespace); } else { - steps.push_back(crate::builder::Step::NewLine); - steps.push_back(crate::builder::Step::Pad); + steps.push_back(crate::builder::Step::Whitespace); } steps.push_back(crate::builder::Step::FormatWider(child.element)); } diff --git a/tests/cases/lambda/out b/tests/cases/lambda/out index b9aaac5..7958151 100644 --- a/tests/cases/lambda/out +++ b/tests/cases/lambda/out @@ -15,8 +15,7 @@ d ) ( - a: - { }: + a: { }: /* c */ @@ -35,8 +34,7 @@ /* b */ - : - d + : d ) ( a @@ -51,8 +49,7 @@ ) (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) ( - aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: - aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ) ( { pkgs ? import ./.. { }