From 917ec049de3bcea6044086edc13c7bd25bd848eb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 18 Feb 2024 21:29:30 +0200 Subject: [PATCH] Bump the minor-changes group with 4 updates (#115) Bumps the minor-changes group with 4 updates: [is-terminal](https://github.com/sunfishcode/is-terminal), [toml](https://github.com/toml-rs/toml), [clap](https://github.com/clap-rs/clap) and [tempfile](https://github.com/Stebalien/tempfile). Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alex Ostrovski --- .github/workflows/build-reusable.yml | 6 +-- .github/workflows/ci.yml | 20 +++++----- .github/workflows/release.yml | 6 +-- Cargo.lock | 60 +++++++++++----------------- Cargo.toml | 6 +-- cli/Cargo.toml | 8 ++-- deny.toml | 4 ++ e2e-tests/rainbow/Cargo.toml | 4 +- src/lib.rs | 2 +- src/test/mod.rs | 2 +- 10 files changed, 55 insertions(+), 63 deletions(-) diff --git a/.github/workflows/build-reusable.yml b/.github/workflows/build-reusable.yml index 972faa1..1d4ed44 100644 --- a/.github/workflows/build-reusable.yml +++ b/.github/workflows/build-reusable.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Rust uses: dtolnay/rust-toolchain@master @@ -22,13 +22,13 @@ jobs: toolchain: ${{ inputs.rust_version }} components: rustfmt, clippy - name: Install cargo-deny - uses: baptiste0928/cargo-install@v2 + uses: baptiste0928/cargo-install@v3 with: crate: cargo-deny version: "^0.14" - name: Cache cargo build - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: target key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 591c79d..f206135 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Rust uses: dtolnay/rust-toolchain@master @@ -34,7 +34,7 @@ jobs: toolchain: ${{ env.msrv }} - name: Cache cargo build - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: target key: ${{ runner.os }}${{ matrix.features }}-msrv-cargo-${{ hashFiles('**/Cargo.lock') }} @@ -58,10 +58,10 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Cache Docker build - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: target/docker key: ${{ runner.os }}-docker-buildkit-${{ hashFiles('Cargo.lock') }} @@ -74,19 +74,19 @@ jobs: - name: Extract Docker metadata id: meta - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: images: ghcr.io/${{ github.repository }} - name: Log in to Container registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Identify Buildx container run: | CONTAINER_ID=$(docker ps --filter=ancestor=moby/buildkit:buildx-stable-1 --format='{{ .ID }}') @@ -103,7 +103,7 @@ jobs: docker buildx du # Check the restored cache - name: Build image - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v5 with: context: . file: cli/Dockerfile @@ -167,7 +167,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Rust uses: dtolnay/rust-toolchain@master @@ -175,7 +175,7 @@ jobs: toolchain: ${{ env.nightly }} - name: Cache cargo build - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: target key: ${{ runner.os }}-cargo-document-${{ hashFiles('Cargo.lock') }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b5da5ad..d6cb5a0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,7 +29,7 @@ jobs: name: Release ${{ matrix.target }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Determine release type id: release-type @@ -47,7 +47,7 @@ jobs: targets: ${{ matrix.target }} - name: Cache cargo build - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: target key: ${{ runner.os }}-release-cargo-${{ hashFiles('Cargo.lock') }} @@ -75,7 +75,7 @@ jobs: files: ${{ steps.package.outputs.archive }} prerelease: ${{ steps.release-type.outputs.type == 'prerelease' }} - name: Attach archive to workflow - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: github.event_name == 'workflow_dispatch' with: name: term-transcript-${{ matrix.target }} diff --git a/Cargo.lock b/Cargo.lock index e113ff9..dc03b7e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -112,9 +112,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.4.18" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" +checksum = "80c21025abd42669a92efc996ef13cfb2c5c627858421ea58d5c3b331a6c134f" dependencies = [ "clap_builder", "clap_derive", @@ -122,9 +122,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.18" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" +checksum = "458bf1f341769dfcf849846f65dffdf9146daa56bcd2a47cb4e1de9915567c99" dependencies = [ "anstream", "anstyle", @@ -135,9 +135,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" dependencies = [ "heck", "proc-macro2", @@ -147,9 +147,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "colorchoice" @@ -337,12 +337,12 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ "hermit-abi", - "rustix", + "libc", "windows-sys 0.52.0", ] @@ -603,15 +603,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "regex" version = "1.10.3" @@ -807,9 +798,9 @@ checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" [[package]] name = "syn" @@ -824,13 +815,12 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.9.0" +version = "3.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" dependencies = [ "cfg-if", "fastrand", - "redox_syscall", "rustix", "windows-sys 0.52.0", ] @@ -853,7 +843,7 @@ dependencies = [ "serde_json", "termcolor", "test-casing", - "toml 0.8.9", + "toml 0.8.10", "tracing", "tracing-capture", "tracing-subscriber", @@ -874,7 +864,7 @@ dependencies = [ "tempfile", "term-transcript", "termcolor", - "toml 0.8.9", + "toml 0.8.10", "tracing-subscriber", ] @@ -924,8 +914,7 @@ dependencies = [ [[package]] name = "test-casing" version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2378d657757969a2cec9ec4eb616be8f01be98c21c6467991f91cb182e4653b" +source = "git+https://github.com/slowli/test-casing.git?rev=dd4d4eac4d3300ca1eed8ec64c22a5b8aa82fdbc#dd4d4eac4d3300ca1eed8ec64c22a5b8aa82fdbc" dependencies = [ "test-casing-macro", ] @@ -933,8 +922,7 @@ dependencies = [ [[package]] name = "test-casing-macro" version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cfbe7811249c4c914b06141b8ac0f2cee2733fb883d05eb19668a45fc60c3d5" +source = "git+https://github.com/slowli/test-casing.git?rev=dd4d4eac4d3300ca1eed8ec64c22a5b8aa82fdbc#dd4d4eac4d3300ca1eed8ec64c22a5b8aa82fdbc" dependencies = [ "proc-macro2", "quote", @@ -1000,14 +988,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.9" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6a4b9e8023eb94392d3dca65d717c53abc5dad49c07cb65bb8fcd87115fa325" +checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.21.1", + "toml_edit 0.22.4", ] [[package]] @@ -1034,9 +1022,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.21.1" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +checksum = "0c9ffdf896f8daaabf9b66ba8e77ea1ed5ed0f72821b398aba62352e95062951" dependencies = [ "indexmap", "serde", diff --git a/Cargo.toml b/Cargo.toml index f8edc73..848b736 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ handlebars = { version = "5.1.0", optional = true } portable-pty = { version = "0.8.0", optional = true } # Private dependencies (not exposed in the public API). -is-terminal = { version = "0.4.10", optional = true } +is-terminal = { version = "0.4.12", optional = true } bytecount = "0.6.7" os_pipe = "1.1.5" serde = { version = "1.0", optional = true, features = ["derive"] } @@ -37,8 +37,8 @@ unicode-width = "0.1.11" anyhow = "1.0.79" assert_matches = "1.5.0" doc-comment = "0.3.3" -test-casing = "0.1.2" -toml = "0.8.9" +test-casing = { version = "0.1.2", git = "https://github.com/slowli/test-casing.git", rev = "dd4d4eac4d3300ca1eed8ec64c22a5b8aa82fdbc" } +toml = "0.8.10" tracing-capture = "0.1.0" tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } version-sync = "0.9.2" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 09d3808..febf1f2 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -16,19 +16,19 @@ path = "src/main.rs" [dependencies] anyhow = "1.0.79" -clap = { version = "4.4.18", features = ["derive", "env", "wrap_help"] } +clap = { version = "4.5.0", features = ["derive", "env", "wrap_help"] } handlebars = "5.1.0" humantime = "2.1.0" -is-terminal = "0.4.10" +is-terminal = "0.4.12" serde_json = "1.0" termcolor = "1.4.1" -toml = "0.8.9" +toml = "0.8.10" tracing-subscriber = { version = "0.3.18", features = ["env-filter"], optional = true } term-transcript = { version = "0.3.0", path = ".." } [dev-dependencies] -tempfile = "3.9.0" +tempfile = "3.10.0" [features] default = [] diff --git a/deny.toml b/deny.toml index 712e44c..bdfacfd 100644 --- a/deny.toml +++ b/deny.toml @@ -44,3 +44,7 @@ skip-tree = [ [sources] unknown-registry = "deny" unknown-git = "deny" +allow-git = [ + # Temporary override fixing new Clippy lints + "https://github.com/slowli/test-casing.git", +] diff --git a/e2e-tests/rainbow/Cargo.toml b/e2e-tests/rainbow/Cargo.toml index 03853ef..87a1965 100644 --- a/e2e-tests/rainbow/Cargo.toml +++ b/e2e-tests/rainbow/Cargo.toml @@ -25,8 +25,8 @@ features = ["tracing"] [dev-dependencies] handlebars = "5.1.0" pretty_assertions = "1.0.0" -tempfile = "3.9.0" -test-casing = "0.1.2" +tempfile = "3.10.0" +test-casing = { version = "0.1.2", git = "https://github.com/slowli/test-casing.git", rev = "dd4d4eac4d3300ca1eed8ec64c22a5b8aa82fdbc" } tracing = "0.1.40" tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } diff --git a/src/lib.rs b/src/lib.rs index a3dc7aa..ce09886 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -130,7 +130,7 @@ //! //! Snapshot testing. See the [`test` module](crate::test) for more examples. //! -//! ``` +//! ```no_run //! use term_transcript::{test::TestConfig, ShellOptions}; //! //! #[test] diff --git a/src/test/mod.rs b/src/test/mod.rs index 9e2de9f..bc1650e 100644 --- a/src/test/mod.rs +++ b/src/test/mod.rs @@ -5,7 +5,7 @@ //! Simple scenario in which the tested transcript calls to one or more Cargo binaries / examples //! by their original names. //! -//! ``` +//! ```no_run //! use term_transcript::{ //! ShellOptions, Transcript, //! test::{MatchKind, TestConfig, TestOutputConfig},