Skip to content

Commit

Permalink
Merge branch 'main' into winnow
Browse files Browse the repository at this point in the history
  • Loading branch information
sunshowers authored Jan 20, 2024
2 parents f05ea08 + 983446d commit 72d2fe6
Show file tree
Hide file tree
Showing 17 changed files with 62 additions and 61 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ jobs:
- uses: dtolnay/rust-toolchain@stable
with:
components: rustfmt, clippy
- uses: Swatinem/rust-cache@a95ba195448af2da9b00fb742d14ffaaf3c21f43 # v2
- uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2
- name: Lint (clippy)
run: cargo clippy --all-features --all-targets
- name: Lint (rustfmt)
run: cargo xfmt --check
- name: Install cargo readme
uses: taiki-e/install-action@2f4c386a81aeab009d470320dfc6e0930ee4e064 # v2
uses: taiki-e/install-action@3ed9916b5427bc0679b294607ea47d1d8007b53f # v2
with:
tool: cargo-readme
- name: Run cargo readme
Expand All @@ -46,7 +46,7 @@ jobs:
- uses: dtolnay/rust-toolchain@stable
with:
components: rustfmt, clippy
- uses: Swatinem/rust-cache@a95ba195448af2da9b00fb742d14ffaaf3c21f43 # v2
- uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2
- name: Build rustdoc
run: cargo doc --all-features --workspace

Expand All @@ -67,7 +67,7 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ matrix.rust-version }}
- uses: Swatinem/rust-cache@a95ba195448af2da9b00fb742d14ffaaf3c21f43 # v2
- uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2
with:
# Matrix instances (other than OS) need to be added to this explicitly
key: ${{ matrix.rust-version }}
Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:
with:
toolchain: stable
targets: x86_64-pc-windows-gnu
- uses: Swatinem/rust-cache@a95ba195448af2da9b00fb742d14ffaaf3c21f43 # v2
- uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2
- name: Install wine and gcc-mingw-w64-x86-64-win32
run: |
sudo apt-get update
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- uses: dtolnay/rust-toolchain@nightly
with:
components: llvm-tools-preview
- uses: Swatinem/rust-cache@a95ba195448af2da9b00fb742d14ffaaf3c21f43 # v2
- uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2

- name: Install latest nextest release
uses: taiki-e/install-action@nextest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ jobs:
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@a95ba195448af2da9b00fb742d14ffaaf3c21f43 # v2
- uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2
- name: Install static-sitemap-cli
run: npm install static-sitemap-cli
- name: Build rustdoc
run: cargo doc --all-features --workspace
- name: Install mdbook
uses: taiki-e/install-action@2f4c386a81aeab009d470320dfc6e0930ee4e064 # v2
uses: taiki-e/install-action@3ed9916b5427bc0679b294607ea47d1d8007b53f # v2
with:
tool: [email protected]
- name: Run mdbook
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/hakari.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: dtolnay/rust-toolchain@stable
- name: Install cargo-hakari
uses: taiki-e/install-action@2f4c386a81aeab009d470320dfc6e0930ee4e064 # v2
uses: taiki-e/install-action@3ed9916b5427bc0679b294607ea47d1d8007b53f # v2
with:
tool: cargo-hakari
- name: Check workspace-hack Cargo.toml is up-to-date
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
- name: Install cargo release
uses: taiki-e/install-action@2f4c386a81aeab009d470320dfc6e0930ee4e064 # v2
uses: taiki-e/install-action@3ed9916b5427bc0679b294607ea47d1d8007b53f # v2
with:
tool: [email protected]
- uses: taiki-e/create-gh-release-action@8df4de6534ceacdaed10a08f73418ca751f31793 # v1
Expand All @@ -42,7 +42,7 @@ jobs:
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
- name: Install cargo release
uses: taiki-e/install-action@2f4c386a81aeab009d470320dfc6e0930ee4e064 # v2
uses: taiki-e/install-action@3ed9916b5427bc0679b294607ea47d1d8007b53f # v2
with:
tool: [email protected]
- uses: taiki-e/create-gh-release-action@8df4de6534ceacdaed10a08f73418ca751f31793 # v1
Expand All @@ -67,7 +67,7 @@ jobs:
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
- name: Install cargo release
uses: taiki-e/install-action@2f4c386a81aeab009d470320dfc6e0930ee4e064 # v2
uses: taiki-e/install-action@3ed9916b5427bc0679b294607ea47d1d8007b53f # v2
with:
tool: [email protected]
- uses: taiki-e/create-gh-release-action@8df4de6534ceacdaed10a08f73418ca751f31793 # v1
Expand All @@ -92,7 +92,7 @@ jobs:
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
- name: Install cargo release
uses: taiki-e/install-action@2f4c386a81aeab009d470320dfc6e0930ee4e064 # v2
uses: taiki-e/install-action@3ed9916b5427bc0679b294607ea47d1d8007b53f # v2
with:
tool: [email protected]
- uses: taiki-e/create-gh-release-action@8df4de6534ceacdaed10a08f73418ca751f31793 # v1
Expand Down Expand Up @@ -235,7 +235,7 @@ jobs:
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
- name: Install cargo release
uses: taiki-e/install-action@2f4c386a81aeab009d470320dfc6e0930ee4e064 # v2
uses: taiki-e/install-action@3ed9916b5427bc0679b294607ea47d1d8007b53f # v2
with:
tool: [email protected]
- name: Download mukti
Expand Down
36 changes: 18 additions & 18 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions cargo-nextest/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ rust-version = "1.70"
[dependencies]
camino = "1.1.6"
cfg-if = "1.0.0"
clap = { version = "4.4.14", features = ["derive", "env"] }
clap = { version = "4.4.18", features = ["derive", "env"] }
# we don't use the tracing support
color-eyre = { version = "0.6.2", default-features = false }
dialoguer = "0.11.0"
duct = "0.13.7"
enable-ansi-support = "0.2.1"
# we don't use the default formatter so we don't need default features
env_logger = { version = "0.10.1", default-features = false }
env_logger = { version = "0.10.2", default-features = false }
guppy = "0.17.4"
log = "0.4.20"
itertools = "0.12.0"
Expand All @@ -37,7 +37,7 @@ pathdiff = { version = "0.2.1", features = ["camino"] }
semver = "1.0.21"
shell-words = "1.1.0"
supports-color = "2.1.0"
supports-unicode = "2.0.0"
supports-unicode = "2.1.0"
serde_json = "1.0.111"
thiserror = "1.0.56"
nextest-workspace-hack.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ cargo-nextest = { path = "../cargo-nextest", default-features = false, features
] }
# we don't use the tracing support
color-eyre = { version = "0.6.2", default-features = false }
clap = { version = "4.4.14", features = ["derive", "env"] }
clap = { version = "4.4.18", features = ["derive", "env"] }
enable-ansi-support = "0.2.1"
nextest-workspace-hack.workspace = true

Expand Down
4 changes: 2 additions & 2 deletions nextest-filtering/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ internal-testing = ["dep:proptest", "dep:test-strategy", "dep:twox-hash"]
globset.workspace = true
guppy = "0.17.4"
miette = "5.10.0"
recursion = "0.5.1"
recursion = "0.5.2"
regex = "1.10.2"
regex-syntax = "0.8.2"
thiserror = "1.0.56"
Expand All @@ -41,7 +41,7 @@ nextest-workspace-hack.workspace = true
winnow = "0.5.34"

[dev-dependencies]
clap = { version = "4.4.14", features = ["derive"] }
clap = { version = "4.4.18", features = ["derive"] }
camino = "1.1.6"
test-case = "3.3.1"
proptest = { version = "1.4.0" }
Expand Down
2 changes: 1 addition & 1 deletion nextest-metadata/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ camino = { version = "1.1.6", features = ["serde1"] }
serde = { version = "1.0.195", features = ["derive"] }
serde_json = "1.0.111"
target-spec = { version = "3.0.1", features = ["custom", "summaries"] }
smol_str = { version = "0.2.0", features = ["serde"] }
smol_str = { version = "0.2.1", features = ["serde"] }
nextest-workspace-hack.workspace = true

[dev-dependencies]
Expand Down
6 changes: 3 additions & 3 deletions nextest-runner/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ serde_ignored = "0.1.10"
serde_json = "1.0.111"
serde_path_to_error = "0.1.15"
shell-words = "1.1.0"
smol_str = { version = "0.2.0", features = ["serde"] }
smol_str = { version = "0.2.1", features = ["serde"] }
strip-ansi-escapes = "0.2.0"
tar = "0.4.40"
# For cfg expression evaluation for [target.'cfg()'] expressions
Expand Down Expand Up @@ -93,12 +93,12 @@ self_update = { version = "0.39.0", optional = true, default-features = false, f
nextest-filtering = { version = "0.7.1", path = "../nextest-filtering" }
nextest-metadata = { version = "0.10.0", path = "../nextest-metadata" }
quick-junit = { version = "0.3.5", path = "../quick-junit" }
uuid = { version = "1.6.1", features = ["v4"] }
uuid = { version = "1.7.0", features = ["v4"] }
console-subscriber = { version = "0.2.0", optional = true }
unicode-ident = "1.0.12"
unicode-normalization = "0.1.22"
indexmap = { version = "2.1.0", features = ["serde"] }
smallvec = "1.11.2"
smallvec = "1.13.1"
nextest-workspace-hack.workspace = true

[target.'cfg(unix)'.dependencies]
Expand Down
4 changes: 2 additions & 2 deletions nextest-runner/src/errors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -454,11 +454,11 @@ impl fmt::Display for PartitionerBuilderParseError {
}
}

/// An error that occures while operating on a
/// An error that occurs while operating on a
/// [`TestFilterBuilder`](crate::test_filter::TestFilterBuilder).
#[derive(Clone, Debug, Error)]
pub enum TestFilterBuilderError {
/// An error that occured while constructing test filters.
/// An error that occurred while constructing test filters.
#[error("error constructing test filters")]
Construct {
/// The underlying error.
Expand Down
Loading

0 comments on commit 72d2fe6

Please sign in to comment.