Skip to content

Commit

Permalink
Merge pull request #149 from epage/update
Browse files Browse the repository at this point in the history
chore: Upgrade dependencies
  • Loading branch information
epage committed Nov 4, 2022
2 parents d19ea7e + 1434148 commit 8e324bd
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 40 deletions.
2 changes: 1 addition & 1 deletion .clippy.toml
@@ -1 +1 @@
msrv = "1.54.0" # MSRV
msrv = "1.60.0" # MSRV
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Expand Up @@ -51,15 +51,15 @@ jobs:
- name: No-default features
run: cargo test --workspace --no-default-features
msrv:
name: "Check MSRV: 1.54.0"
name: "Check MSRV: 1.60.0"
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: 1.54.0 # MSRV
toolchain: 1.60.0 # MSRV
profile: minimal
override: true
- uses: Swatinem/rust-cache@v1
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: 1.54.0 # MSRV
toolchain: 1.60.0 # MSRV
profile: minimal
override: true
components: clippy
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rust-next.yml
Expand Up @@ -59,9 +59,9 @@ jobs:
strategy:
matrix:
rust:
- 1.54.0 # MSRV
- 1.60.0 # MSRV
- stable
continue-on-error: ${{ matrix.rust != '1.54.0' }} # MSRV
continue-on-error: ${{ matrix.rust != '1.60.0' }} # MSRV
runs-on: ubuntu-latest
steps:
- name: Checkout repository
Expand Down
55 changes: 28 additions & 27 deletions Cargo.lock

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

15 changes: 8 additions & 7 deletions Cargo.toml
Expand Up @@ -10,7 +10,8 @@ documentation = "http://docs.rs/assert_cmd/"
readme = "README.md"
categories = ["development-tools::testing"]
keywords = ["cli", "test", "assert", "command", "duct"]
edition = "2018"
edition = "2021"
rust-version = "1.60.0" # MSRV
include = [
"build.rs",
"src/**/*",
Expand All @@ -31,21 +32,21 @@ pre-release-replacements = [
]

[features]
color = ["yansi", "concolor/std", "predicates/color"]
color-auto = ["color", "concolor/auto"]
color = ["dep:yansi", "dep:concolor", "concolor?/std", "predicates/color"]
color-auto = ["color", "concolor?/auto"]

[[bin]]
name = "bin_fixture"

[dependencies]
predicates = { version = "2.0", default-features = false, features = ["diff"] }
predicates = { version = "2.1", default-features = false, features = ["diff"] }
predicates-core = "1.0"
predicates-tree = "1.0"
doc-comment = "0.3"
wait-timeout = "0.2.0"
bstr = "0.2.14"
yansi = { version = "0.5.0", optional = true }
concolor = { version = "0.0.8", optional = true }
bstr = "1.0.1"
yansi = { version = "0.5.1", optional = true }
concolor = { version = "0.0.9", optional = true }

[dev-dependencies]
escargot = "0.5"

0 comments on commit 8e324bd

Please sign in to comment.