From e7eac49074b70814b542fee987af2987dd0520b5 Mon Sep 17 00:00:00 2001 From: Kevin Amado Date: Sun, 14 Aug 2022 14:50:49 -0600 Subject: [PATCH] feat: release 3.0.0 --- .pre-commit-entry.sh | 2 +- CHANGELOG.md | 38 ++++++++++++++++++- Cargo.lock | 56 ++++++++++++++-------------- README.md | 18 ++++----- flake.nix | 2 +- front/Cargo.lock | 62 +++++++++++++++---------------- front/Cargo.toml | 2 +- front/flake.lock | 18 ++++----- integrations/pre-commit/README.md | 2 +- integrations/vscode/package.json | 2 +- integrations/vscode/yarn.lock | 12 +++--- integrations/vscode/yarn.lock.nix | 16 ++++---- src/alejandra/Cargo.toml | 2 +- src/alejandra/src/version.rs | 2 +- src/alejandra_cli/Cargo.toml | 2 +- src/alejandra_cli/src/ads/mod.rs | 4 +- src/alejandra_cli/src/cli.rs | 14 +++---- src/alejandra_cli/src/find.rs | 10 ++--- 18 files changed, 148 insertions(+), 116 deletions(-) diff --git a/.pre-commit-entry.sh b/.pre-commit-entry.sh index 7880333..4f72a41 100755 --- a/.pre-commit-entry.sh +++ b/.pre-commit-entry.sh @@ -20,7 +20,7 @@ echo INFO: building Alejandra nix-build \ --attr ${system} \ --out-link result-alejandra \ - https://github.com/kamadorueda/alejandra/tarball/2.0.0 + https://github.com/kamadorueda/alejandra/tarball/3.0.0 echo INFO: running Alejandra: result-alejandra/bin/alejandra -- -q "${@}" diff --git a/CHANGELOG.md b/CHANGELOG.md index be5989f..4138204 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,41 @@ Types of changes - Security in case of vulnerabilities. --> +## [3.0.0] - 2022-08-14 + +### Added + +- Different levels of --quiet by repeating the `-q` flag, + which makes Vim users have a better formatting experience by using `:%!alejandra -qq` to format the current buffer, + specially when the file has syntax errors. +- The possibility for companies to promote their business + by placing an add at the end of Alejandra's terminal output, and thank you messages for the sponsors of the project. + + You can obtain this benefits in @kamadorueda's [sponsor page](https://github.com/sponsors/kamadorueda). + +- Thank you messages for the different people + who have helped improving Alejandra. + +### Changed + +- Now big files are formatted first, + making faster the formatting process + when using many threads and + when formatting a big file is slower + than formatting all the other smaller files in the repository. + For instance in Nixpkgs. +- The CLI was simplified, + removing the elements that people find less useful + and polishing those that people use the most. + The screen is not cleared anymore. +- Upgraded dependencies to its latest version. + +### Fixed + +- The name displayed in the CLI application used to be `alejandra_cli`, + now it is `Alejandra`. +- Typos here and there. + ## [2.0.0] - 2022-07-13 ### Added @@ -641,7 +676,8 @@ Types of changes --- -[unreleased]: https://github.com/kamadorueda/alejandra/compare/2.0.0...HEAD +[unreleased]: https://github.com/kamadorueda/alejandra/compare/3.0.0...HEAD +[3.0.0]: https://github.com/kamadorueda/alejandra/compare/2.0.0...3.0.0 [2.0.0]: https://github.com/kamadorueda/alejandra/compare/1.5.0...2.0.0 [1.5.0]: https://github.com/kamadorueda/alejandra/compare/1.4.0...1.5.0 [1.4.0]: https://github.com/kamadorueda/alejandra/compare/1.3.0...1.4.0 diff --git a/Cargo.lock b/Cargo.lock index c548b8f..512c998 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,7 +4,7 @@ version = 3 [[package]] name = "alejandra" -version = "2.0.0" +version = "3.0.0" dependencies = [ "mimalloc", "rnix", @@ -13,7 +13,7 @@ dependencies = [ [[package]] name = "alejandra_cli" -version = "2.0.0" +version = "3.0.0" dependencies = [ "alejandra", "clap", @@ -69,9 +69,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "3.2.16" +version = "3.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3dbbb6653e7c55cc8595ad3e1f7be8f32aba4eb7ff7f0fd1163d4f3d137c0a9" +checksum = "29e724a68d9319343bb3328c9cc2dfde263f4b3142ee1059a9980580171c954b" dependencies = [ "atty", "bitflags", @@ -86,9 +86,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "3.2.15" +version = "3.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba52acd3b0a5c33aeada5cdaa3267cdc7c594a98731d4268cdc1532f4264cb4" +checksum = "13547f7012c01ab4a0e8f8967730ada8f9fdf419e8b6c792788f39cf4e46eefa" dependencies = [ "heck", "proc-macro-error", @@ -114,9 +114,9 @@ checksum = "328b822bdcba4d4e402be8d9adb6eebf269f969f8eadef977a553ff3c4fbcb58" [[package]] name = "futures" -version = "0.3.21" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" +checksum = "ab30e97ab6aacfe635fad58f22c2bb06c8b685f7421eb1e064a729e2a5f481fa" dependencies = [ "futures-channel", "futures-core", @@ -129,9 +129,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.21" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" +checksum = "2bfc52cbddcfd745bf1740338492bb0bd83d76c67b445f91c5fb29fae29ecaa1" dependencies = [ "futures-core", "futures-sink", @@ -139,15 +139,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.21" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" +checksum = "d2acedae88d38235936c3922476b10fced7b2b68136f5e3c03c2d5be348a1115" [[package]] name = "futures-executor" -version = "0.3.21" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" +checksum = "1d11aa21b5b587a64682c0094c2bdd4df0076c5324961a40cc3abd7f37930528" dependencies = [ "futures-core", "futures-task", @@ -157,27 +157,27 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.21" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" +checksum = "93a66fc6d035a26a3ae255a6d2bca35eda63ae4c5512bef54449113f7a1228e5" [[package]] name = "futures-sink" -version = "0.3.21" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" +checksum = "ca0bae1fe9752cf7fd9b0064c674ae63f97b37bc714d745cbde0afb7ec4e6765" [[package]] name = "futures-task" -version = "0.3.21" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" +checksum = "842fc63b931f4056a24d59de13fb1272134ce261816e063e634ad0c15cdc5306" [[package]] name = "futures-util" -version = "0.3.21" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" +checksum = "f0828a5471e340229c11c77ca80017937ce3c58cb788a17e5f1c2d5c485a9577" dependencies = [ "futures-channel", "futures-core", @@ -240,9 +240,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.127" +version = "0.2.131" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "505e71a4706fa491e9b1b55f51b95d4037d0821ee40131190475f692b35b009b" +checksum = "04c3b4822ccebfa39c02fc03d1534441b22ead323fa0f48bb7ddd8e6ba076a40" [[package]] name = "libmimalloc-sys" @@ -304,9 +304,9 @@ checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" [[package]] name = "os_str_bytes" -version = "6.2.0" +version = "6.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "648001efe5d5c0102d8cea768e348da85d90af8ba91f0bea908f157951493cd4" +checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" [[package]] name = "pin-project-lite" @@ -421,9 +421,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.142" +version = "1.0.143" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e590c437916fb6b221e1d00df6e3294f3fccd70ca7e92541c475d6ed6ef5fee2" +checksum = "53e8e5d5b70924f74ff5c6d64d9a5acd91422117c60f48c4e07855238a254553" [[package]] name = "slab" diff --git a/README.md b/README.md index be63b57..5a35f29 100644 --- a/README.md +++ b/README.md @@ -114,11 +114,11 @@ Please visit: You can download a binary for your platform: -- [aarch64-unknown-linux-musl](https://github.com/kamadorueda/alejandra/releases/download/2.0.0/alejandra-aarch64-unknown-linux-musl) -- [armv6l-unknown-linux-musleabihf](https://github.com/kamadorueda/alejandra/releases/download/2.0.0/alejandra-armv6l-unknown-linux-musleabihf) -- [armv7l-unknown-linux-musleabihf](https://github.com/kamadorueda/alejandra/releases/download/2.0.0/alejandra-armv7l-unknown-linux-musleabihf) -- [i686-unknown-linux-musl](https://github.com/kamadorueda/alejandra/releases/download/2.0.0/alejandra-i686-unknown-linux-musl) -- [x86_64-unknown-linux-musl](https://github.com/kamadorueda/alejandra/releases/download/2.0.0/alejandra-x86_64-unknown-linux-musl) +- [aarch64-unknown-linux-musl](https://github.com/kamadorueda/alejandra/releases/download/3.0.0/alejandra-aarch64-unknown-linux-musl) +- [armv6l-unknown-linux-musleabihf](https://github.com/kamadorueda/alejandra/releases/download/3.0.0/alejandra-armv6l-unknown-linux-musleabihf) +- [armv7l-unknown-linux-musleabihf](https://github.com/kamadorueda/alejandra/releases/download/3.0.0/alejandra-armv7l-unknown-linux-musleabihf) +- [i686-unknown-linux-musl](https://github.com/kamadorueda/alejandra/releases/download/3.0.0/alejandra-i686-unknown-linux-musl) +- [x86_64-unknown-linux-musl](https://github.com/kamadorueda/alejandra/releases/download/3.0.0/alejandra-x86_64-unknown-linux-musl) Make it executable (`$ chmod +x`) and run Alejandra with: @@ -142,13 +142,13 @@ Please visit: [search.nixos.org/packages?query=alejandra](https://search.nixos.o - Nix stable: ```bash - $ nix-env -ivf https://github.com/kamadorueda/alejandra/tarball/2.0.0 + $ nix-env -ivf https://github.com/kamadorueda/alejandra/tarball/3.0.0 ``` - Nix with [Flakes](https://nixos.wiki/wiki/Flakes): ```bash - $ nix profile install github:kamadorueda/alejandra/2.0.0 + $ nix profile install github:kamadorueda/alejandra/3.0.0 ``` Then run Alejandra with: @@ -165,7 +165,7 @@ $ alejandra --help let alejandra = (import (builtins.fetchTarball { - url = "https://github.com/kamadorueda/alejandra/tarball/2.0.0"; + url = "https://github.com/kamadorueda/alejandra/tarball/3.0.0"; sha256 = "0000000000000000000000000000000000000000000000000000"; }) {}) .outPath; @@ -181,7 +181,7 @@ $ alejandra --help inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - alejandra.url = "github:kamadorueda/alejandra/2.0.0"; + alejandra.url = "github:kamadorueda/alejandra/3.0.0"; alejandra.inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/flake.nix b/flake.nix index e65e611..6fe41fe 100644 --- a/flake.nix +++ b/flake.nix @@ -14,7 +14,7 @@ outputs = inputs: let commit = inputs.self.shortRev or "dirty"; date = inputs.self.lastModifiedDate or inputs.self.lastModified or "19700101"; - version = "2.0.0+${builtins.substring 0 8 date}.${commit}"; + version = "3.0.0+${builtins.substring 0 8 date}.${commit}"; nixpkgsForHost = host: import inputs.nixpkgs { diff --git a/front/Cargo.lock b/front/Cargo.lock index 1fc459e..1562f78 100644 --- a/front/Cargo.lock +++ b/front/Cargo.lock @@ -4,7 +4,7 @@ version = 3 [[package]] name = "alejandra" -version = "2.0.0" +version = "3.0.0" dependencies = [ "mimalloc", "rnix", @@ -13,7 +13,7 @@ dependencies = [ [[package]] name = "alejandra_front" -version = "2.0.0" +version = "3.0.0" dependencies = [ "alejandra", "console_error_panic_hook", @@ -82,17 +82,11 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - [[package]] name = "libc" -version = "0.2.126" +version = "0.2.131" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" +checksum = "04c3b4822ccebfa39c02fc03d1534441b22ead323fa0f48bb7ddd8e6ba076a40" [[package]] name = "libmimalloc-sys" @@ -145,20 +139,26 @@ dependencies = [ "autocfg", ] +[[package]] +name = "once_cell" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" + [[package]] name = "proc-macro2" -version = "1.0.40" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" +checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.20" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" +checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" dependencies = [ "proc-macro2", ] @@ -195,9 +195,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "serde" -version = "1.0.139" +version = "1.0.143" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0171ebb889e45aa68b44aee0859b3eede84c6f5f5c228e6f140c0b2a0a46cad6" +checksum = "53e8e5d5b70924f74ff5c6d64d9a5acd91422117c60f48c4e07855238a254553" [[package]] name = "smol_str" @@ -210,9 +210,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.98" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" +checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" dependencies = [ "proc-macro2", "quote", @@ -227,15 +227,15 @@ checksum = "288cb548dbe72b652243ea797201f3d481a0609a967980fcc5b2315ea811560a" [[package]] name = "unicode-ident" -version = "1.0.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c" +checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" [[package]] name = "wasm-bindgen" -version = "0.2.81" +version = "0.2.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c53b543413a17a202f4be280a7e5c62a1c69345f5de525ee64f8cfdbc954994" +checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -243,13 +243,13 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.81" +version = "0.2.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5491a68ab4500fa6b4d726bd67408630c3dbe9c4fe7bda16d5c82a1fd8c7340a" +checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f" dependencies = [ "bumpalo", - "lazy_static", "log", + "once_cell", "proc-macro2", "quote", "syn", @@ -258,9 +258,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.81" +version = "0.2.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c441e177922bc58f1e12c022624b6216378e5febc2f0533e41ba443d505b80aa" +checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -268,9 +268,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.81" +version = "0.2.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d94ac45fcf608c1f45ef53e748d35660f168490c10b23704c7779ab8f5c3048" +checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" dependencies = [ "proc-macro2", "quote", @@ -281,9 +281,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.81" +version = "0.2.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a89911bd99e5f3659ec4acf9c4d93b0a90fe4a2a11f15328472058edc5261be" +checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a" [[package]] name = "wee_alloc" diff --git a/front/Cargo.toml b/front/Cargo.toml index 723bf78..c55d3d4 100644 --- a/front/Cargo.toml +++ b/front/Cargo.toml @@ -13,7 +13,7 @@ description = "The Uncompromising Nix Code Formatter" edition = "2021" name = "alejandra_front" repository = "https://github.com/kamadorueda/alejandra" -version = "2.0.0" +version = "3.0.0" [profile.release] lto = true diff --git a/front/flake.lock b/front/flake.lock index f921d40..a4e1360 100644 --- a/front/flake.lock +++ b/front/flake.lock @@ -8,11 +8,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1657607339, - "narHash": "sha256-HaqoAwlbVVZH2n4P3jN2FFPMpVuhxDy1poNOR7kzODc=", + "lastModified": 1660458418, + "narHash": "sha256-vBWAv4QhXa9VmyaJUsTfQmKs+uw83Pfv/FmN5GD3KkE=", "owner": "nix-community", "repo": "fenix", - "rev": "b814c83d9e6aa5a28d0cf356ecfdafb2505ad37d", + "rev": "54253fb23a5871466ada5c0334b6e39a0bcdb4db", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1657425264, - "narHash": "sha256-3aHvoI2e8vJKw3hvnHECaBpSsL5mxVsVtaLCnTdNcH8=", + "lastModified": 1660453166, + "narHash": "sha256-5+I1PdCytC2gLTzcSJJyF9Iqj2YdvWfVhbE9if2KzQo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "de5b3dd17034e6106e75746e81618e5bd408de8a", + "rev": "1953c7efc429764b69e5df604d0f5e3d95277b3e", "type": "github" }, "original": { @@ -46,11 +46,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1657557289, - "narHash": "sha256-PRW+nUwuqNTRAEa83SfX+7g+g8nQ+2MMbasQ9nt6+UM=", + "lastModified": 1660416638, + "narHash": "sha256-DllHrfAUUjg0tBYvj32jr4NQZrH0dC9sRiBPqN8C03w=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "caf23f29144b371035b864a1017dbc32573ad56d", + "rev": "010f68cacfdddcc50234b54965e1326d7ad925ab", "type": "github" }, "original": { diff --git a/integrations/pre-commit/README.md b/integrations/pre-commit/README.md index 1a706d4..790f786 100644 --- a/integrations/pre-commit/README.md +++ b/integrations/pre-commit/README.md @@ -8,7 +8,7 @@ with contents: ```yaml repos: - repo: https://github.com/kamadorueda/alejandra - rev: 2.0.0 + rev: 3.0.0 # Choose either the 'alejandra' or 'alejandra-system' hook # depending on what pre-requisites you have: hooks: diff --git a/integrations/vscode/package.json b/integrations/vscode/package.json index c56b29e..7585b51 100644 --- a/integrations/vscode/package.json +++ b/integrations/vscode/package.json @@ -65,5 +65,5 @@ "type": "git", "url": "https://github.com/kamadorueda/alejandra" }, - "version": "2.0.0" + "version": "3.0.0" } diff --git a/integrations/vscode/yarn.lock b/integrations/vscode/yarn.lock index 1ae612c..3bc3a4e 100644 --- a/integrations/vscode/yarn.lock +++ b/integrations/vscode/yarn.lock @@ -412,9 +412,9 @@ napi-build-utils@^1.0.1: integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg== node-abi@^3.3.0: - version "3.22.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.22.0.tgz#00b8250e86a0816576258227edbce7bbe0039362" - integrity sha512-u4uAs/4Zzmp/jjsD9cyFYDXeISfUWaAVWshPmDZOFOv4Xl4SbzTXm53I04C2uRueYJ+0t5PEtLH/owbn2Npf/w== + version "3.24.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.24.0.tgz#b9d03393a49f2c7e147d0c99f180e680c27c1599" + integrity sha512-YPG3Co0luSu6GwOBsmIdGW6Wx0NyNDLg/hriIyDllVsNwnI6UeqaWShxC3lbH4LtEQUgoLP3XR1ndXiDAWvmRw== dependencies: semver "^7.3.5" @@ -674,9 +674,9 @@ util-deprecate@^1.0.1: integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== vsce@*: - version "2.9.2" - resolved "https://registry.yarnpkg.com/vsce/-/vsce-2.9.2.tgz#be5d2ca5899f31ba84225d6b19ea1376589df897" - integrity sha512-xyLqL4U82BilUX1t6Ym2opQEa2tLGWYjbgB7+ETeNVXlIJz5sWBJjQJSYJVFOKJSpiOtQclolu88cj7oY6vvPQ== + version "2.10.0" + resolved "https://registry.yarnpkg.com/vsce/-/vsce-2.10.0.tgz#19a9f070ec319e26d4f23567f32826f48fc694aa" + integrity sha512-b+wB3XMapEi368g64klSM6uylllZdNutseqbNY+tUoHYSy6g2NwnlWuAGKDQTYc0IqfDUjUFRQBpPgA89Q+Fyw== dependencies: azure-devops-node-api "^11.0.1" chalk "^2.4.2" diff --git a/integrations/vscode/yarn.lock.nix b/integrations/vscode/yarn.lock.nix index fbcf9ea..447e3e2 100644 --- a/integrations/vscode/yarn.lock.nix +++ b/integrations/vscode/yarn.lock.nix @@ -504,11 +504,11 @@ }; } { - name = "node_abi___node_abi_3.22.0.tgz"; + name = "node_abi___node_abi_3.24.0.tgz"; path = fetchurl { - name = "node_abi___node_abi_3.22.0.tgz"; - url = "https://registry.yarnpkg.com/node-abi/-/node-abi-3.22.0.tgz"; - sha512 = "u4uAs/4Zzmp/jjsD9cyFYDXeISfUWaAVWshPmDZOFOv4Xl4SbzTXm53I04C2uRueYJ+0t5PEtLH/owbn2Npf/w=="; + name = "node_abi___node_abi_3.24.0.tgz"; + url = "https://registry.yarnpkg.com/node-abi/-/node-abi-3.24.0.tgz"; + sha512 = "YPG3Co0luSu6GwOBsmIdGW6Wx0NyNDLg/hriIyDllVsNwnI6UeqaWShxC3lbH4LtEQUgoLP3XR1ndXiDAWvmRw=="; }; } { @@ -800,11 +800,11 @@ }; } { - name = "vsce___vsce_2.9.2.tgz"; + name = "vsce___vsce_2.10.0.tgz"; path = fetchurl { - name = "vsce___vsce_2.9.2.tgz"; - url = "https://registry.yarnpkg.com/vsce/-/vsce-2.9.2.tgz"; - sha512 = "xyLqL4U82BilUX1t6Ym2opQEa2tLGWYjbgB7+ETeNVXlIJz5sWBJjQJSYJVFOKJSpiOtQclolu88cj7oY6vvPQ=="; + name = "vsce___vsce_2.10.0.tgz"; + url = "https://registry.yarnpkg.com/vsce/-/vsce-2.10.0.tgz"; + sha512 = "b+wB3XMapEi368g64klSM6uylllZdNutseqbNY+tUoHYSy6g2NwnlWuAGKDQTYc0IqfDUjUFRQBpPgA89Q+Fyw=="; }; } { diff --git a/src/alejandra/Cargo.toml b/src/alejandra/Cargo.toml index af8f6c7..1bcbbbe 100644 --- a/src/alejandra/Cargo.toml +++ b/src/alejandra/Cargo.toml @@ -33,4 +33,4 @@ edition = "2021" license = "Unlicense" name = "alejandra" repository = "https://github.com/kamadorueda/alejandra" -version = "2.0.0" +version = "3.0.0" diff --git a/src/alejandra/src/version.rs b/src/alejandra/src/version.rs index 6fe53a8..6edb889 100644 --- a/src/alejandra/src/version.rs +++ b/src/alejandra/src/version.rs @@ -1,2 +1,2 @@ /// The version of Alejandra. -pub const VERSION: &str = "2.0.0"; +pub const VERSION: &str = "3.0.0"; diff --git a/src/alejandra_cli/Cargo.toml b/src/alejandra_cli/Cargo.toml index fc6a30e..34b2b16 100644 --- a/src/alejandra_cli/Cargo.toml +++ b/src/alejandra_cli/Cargo.toml @@ -28,4 +28,4 @@ edition = "2021" license = "Unlicense" name = "alejandra_cli" repository = "https://github.com/kamadorueda/alejandra" -version = "2.0.0" +version = "3.0.0" diff --git a/src/alejandra_cli/src/ads/mod.rs b/src/alejandra_cli/src/ads/mod.rs index c86180e..93f91ef 100644 --- a/src/alejandra_cli/src/ads/mod.rs +++ b/src/alejandra_cli/src/ads/mod.rs @@ -33,10 +33,10 @@ fn sponsor_benefits() -> String { match random_weighted_choice(&sponsors[..]) { Sponsor::Company { ad } => { include_str!("sponsor_advertisement.txt").replace("{ad}", ad) - }, + } Sponsor::Individual { name } => { include_str!("sponsor_thanks.txt").replace("{name}", name) - }, + } } } diff --git a/src/alejandra_cli/src/cli.rs b/src/alejandra_cli/src/cli.rs index 24eac2b..bab102c 100644 --- a/src/alejandra_cli/src/cli.rs +++ b/src/alejandra_cli/src/cli.rs @@ -51,7 +51,7 @@ struct CLIArgs { #[derive(Clone)] struct FormattedPath { - pub path: String, + pub path: String, pub status: alejandra::format::Status, } @@ -147,12 +147,12 @@ pub fn main() -> std::io::Result<()> { let formatted_paths = match &include[..] { &[] | &["-"] => { vec![crate::cli::format_stdin(verbosity)] - }, + } include => { let paths = crate::find::nix_files(include, &args.exclude); crate::cli::format_paths(paths, in_place, verbosity, threads) - }, + } }; let errors = formatted_paths @@ -183,11 +183,9 @@ pub fn main() -> std::io::Result<()> { let changed = formatted_paths .iter() - .filter(|formatted_path| { - match formatted_path.status { - alejandra::format::Status::Changed(changed) => changed, - _ => false, - } + .filter(|formatted_path| match formatted_path.status { + alejandra::format::Status::Changed(changed) => changed, + _ => false, }) .count(); diff --git a/src/alejandra_cli/src/find.rs b/src/alejandra_cli/src/find.rs index 1bcbba4..54d3925 100644 --- a/src/alejandra_cli/src/find.rs +++ b/src/alejandra_cli/src/find.rs @@ -22,11 +22,9 @@ fn nix_files_in_path(path: &str) -> HashSet { walkdir::WalkDir::new(path) .into_iter() .filter_entry(is_nix_file_or_dir) - .filter_map(|entry| { - match entry { - Ok(entry) => Some(entry), - Err(_) => None, - } + .filter_map(|entry| match entry { + Ok(entry) => Some(entry), + Err(_) => None, }) .filter(is_nix_file) .map(to_full_path) @@ -53,6 +51,6 @@ fn len_of(path: &str) -> u64 { eprintln!("Could not get the size of file at: {path}"); eprintln!("Got error: {err}"); exit(1); - }, + } } }