diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ba768a1922..3f3cfc4f52 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -44,7 +44,7 @@ jobs: with: components: clippy, rustfmt override: true - toolchain: 1.54.0 + toolchain: 1.56.0 - uses: Swatinem/rust-cache@v1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 14328db0dc..f14593e760 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,21 @@ Changelog ========= +[1.4.0](https://github.com/casey/just/releases/tag/1.4.0) - 2022-8-08 +--------------------------------------------------------------------- + +### Fixed +- Fix shell setting precedence (#1306) + +### Misc +- Don't hardcode homebrew prefix (#1295) +- Exclude files from cargo package (#1283) +- Add usage note to default list recipe (#1296) +- Add MPR/Prebuilt-MPR installation instructions to README.md (#1280) +- Add make and makesure to readme (#1299) +- Document how to configure zsh completions on MacOS (#1285) +- Convert package table to HTML (#1291) + [1.3.0](https://github.com/casey/just/releases/tag/1.3.0) - 2022-7-25 --------------------------------------------------------------------- diff --git a/Cargo.lock b/Cargo.lock index 7d5441db03..2a1aa66833 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -115,9 +115,9 @@ dependencies = [ [[package]] name = "ctor" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c" +checksum = "cdffe87e1d521a10f9696f833fe502293ea446d7f256c06128293a4119bdf4cb" dependencies = [ "quote", "syn", @@ -222,9 +222,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.5" +version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" dependencies = [ "typenum", "version_check", @@ -291,13 +291,13 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" +checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" [[package]] name = "just" -version = "1.3.0" +version = "1.4.0" dependencies = [ "ansi_term", "atty", @@ -346,9 +346,9 @@ checksum = "441225017b106b9f902e97947a6d31e44ebcf274b91bdbfb51e5c477fcd468e5" [[package]] name = "libc" -version = "0.2.126" +version = "0.2.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" +checksum = "505e71a4706fa491e9b1b55f51b95d4037d0821ee40131190475f692b35b009b" [[package]] name = "linked-hash-map" @@ -429,18 +429,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.41" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdcc2916cde080c1876ff40292a396541241fe0072ef928cd76582e9ea5d60d2" +checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" dependencies = [ "unicode-ident", ] [[package]] name = "pulldown-cmark" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34f197a544b0c9ab3ae46c359a7ec9cbbb5c7bf97054266fecb7ead794a181d6" +checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63" dependencies = [ "bitflags", "getopts", @@ -459,18 +459,18 @@ dependencies = [ [[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", ] [[package]] name = "redox_syscall" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534cfe58d6a18cc17120fbf4635d53d14691c1fe4d951064df9bd326178d7d5a" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ "bitflags", ] @@ -518,30 +518,30 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24c8ad4f0c00e1eb5bc7614d236a7f1300e3dbd76b68cac8e06fb00b015ad8d8" +checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" [[package]] name = "ryu" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695" +checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" [[package]] name = "serde" -version = "1.0.140" +version = "1.0.143" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc855a42c7967b7c369eb5860f7164ef1f6f81c20c7cc1141f2a604e18723b03" +checksum = "53e8e5d5b70924f74ff5c6d64d9a5acd91422117c60f48c4e07855238a254553" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.140" +version = "1.0.143" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2122636b9fe3b81f1cb25099fcf2d3f542cdb1d45940d56c713158884a05da" +checksum = "d3d8e8de557aee63c26b85b947f5e59b690d0454c753f3adeb5cd7835ab88391" dependencies = [ "proc-macro2", "quote", @@ -550,9 +550,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.82" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7" +checksum = "38dd04e3c8279e75b31ef29dbdceebfe5ad89f4d0937213c53f7d49d01b3d5a7" dependencies = [ "itoa", "ryu", @@ -572,9 +572,9 @@ dependencies = [ [[package]] name = "similar" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e24979f63a11545f5f2c60141afe249d4f19f84581ea2138065e400941d83d3" +checksum = "62ac7f900db32bf3fd12e0117dd3dc4da74bc52ebaac97f39668446d89694803" dependencies = [ "bstr", "unicode-segmentation", @@ -643,9 +643,9 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.24.2" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4faebde00e8ff94316c01800f9054fd2ba77d30d9e922541913051d1d978918b" +checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ "heck 0.4.0", "proc-macro2", @@ -656,9 +656,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", @@ -746,9 +746,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7" +checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" [[package]] name = "unicode-segmentation" diff --git a/Cargo.toml b/Cargo.toml index 3b3624b87f..16af72f727 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,13 +1,13 @@ [package] name = "just" -version = "1.3.0" +version = "1.4.0" description = "🤖 Just a command runner" authors = ["Casey Rodarmor "] license = "CC0-1.0" homepage = "https://github.com/casey/just" repository = "https://github.com/casey/just" readme = "crates-io-readme.md" -edition = "2018" +edition = "2021" autotests = false categories = ["command-line-utilities", "development-tools"] keywords = ["command-line", "task", "runner", "development", "utility"] diff --git a/man/just.1 b/man/just.1 index 0b3cc36536..52872af035 100644 --- a/man/just.1 +++ b/man/just.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2. -.TH JUST "1" "July 2022" "just 1.3.0" "Just Manual" +.TH JUST "1" "August 2022" "just 1.4.0" "Just Manual" .SH NAME just \- save and run commands .SH DESCRIPTION -just 1.3.0 +just 1.4.0 \- Please see https://github.com/casey/just for more information. .SS "USAGE:" .IP @@ -14,12 +14,12 @@ just [FLAGS] [OPTIONS] [\-\-] [ARGUMENTS]... Print changelog .TP \fB\-\-check\fR -Run `\-\-fmt` in 'check' mode. Exits with 0 if justfile is formatted correctly. Exits with 1 -and prints a diff if formatting is required. +Run `\-\-fmt` in 'check' mode. Exits with 0 if justfile is formatted correctly. Exits with +1 and prints a diff if formatting is required. .TP \fB\-\-choose\fR -Select one or more recipes to run using a binary. If `\-\-chooser` is not passed the chooser -defaults to the value of $JUST_CHOOSER, falling back to `fzf` +Select one or more recipes to run using a binary. If `\-\-chooser` is not passed the +chooser defaults to the value of $JUST_CHOOSER, falling back to `fzf` .TP \fB\-\-clear\-shell\-args\fR Clear shell arguments @@ -98,8 +98,9 @@ Run an arbitrary command with the working directory, `.env`, overrides, and expo \fB\-\-completions\fR .IP Print shell completion script for [possible values: zsh, bash, fish, powershell, elvish] -.TP +.HP \fB\-\-dotenv\-filename\fR +.IP Search for environment file named instead of `.env` .TP \fB\-\-dotenv\-path\fR diff --git a/src/testing.rs b/src/testing.rs index 121f15fc26..89dfd46076 100644 --- a/src/testing.rs +++ b/src/testing.rs @@ -121,7 +121,7 @@ macro_rules! run_error { } macro_rules! assert_matches { - ($expression:expr, $( $pattern:pat )|+ $( if $guard:expr )?) => { + ($expression:expr, $( $pattern:pat_param )|+ $( if $guard:expr )?) => { match $expression { $( $pattern )|+ $( if $guard )? => {} left => panic!(