Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert colored crate version pinning #196

Merged
merged 1 commit into from
Feb 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v1
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.68.0
toolchain: 1.70.0
profile: minimal
components: clippy, rustfmt
override: true
Expand All @@ -29,7 +29,7 @@ jobs:
- uses: actions/checkout@v1
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.68.0
toolchain: 1.70.0
profile: minimal
components: clippy, rustfmt
override: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v1
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.68.0
toolchain: 1.70.0
profile: minimal
override: true
- name: Check
Expand Down
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ keywords = ["mock", "mocks", "http", "webmock", "webmocks"]
categories = ["development-tools::testing", "web-programming"]
exclude = ["/.appveyor.yml", "/.travis.yml", "/benchmarks.txt", "/docs/", "/slides.pdf"]
edition = "2021"
rust-version = "1.68"
rust-version = "1.70"

[badges]
travis-ci = { repository = "lipanski/mockito", branch = "master" }
appveyor = { repository = "lipanski/mockito", branch = "master", service = "github" }

[dependencies]
assert-json-diff = "2.0"
colored = { version = "~2.0", optional = true }
colored = { version = "2.0", optional = true }
futures-core = "0.3"
hyper = { version = "0.14", features = ["http1", "http2", "server", "stream"] }
log = "0.4"
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<p align="center">
<a href="https://docs.rs/mockito"><img src="https://docs.rs/mockito/badge.svg"></a>
<a href="https://crates.io/crates/mockito"><img src="https://img.shields.io/crates/v/mockito.svg"></a>
<img src="https://img.shields.io/badge/rust%20version-%3E%3D1.68.0-orange">
<img src="https://img.shields.io/badge/rust%20version-%3E%3D1.70.0-orange">
<a href="https://crates.io/crates/mockito"><img src="https://img.shields.io/crates/d/mockito"></a>
<a href="https://github.com/lipanski/mockito/actions/workflows/tests.yml/?branch=master"><img src="https://github.com/lipanski/mockito/actions/workflows/tests.yml/badge.svg?branch=master"></a>
</p>
Expand Down Expand Up @@ -139,7 +139,7 @@ fn main() {

## Minimum supported Rust toolchain

The current minimum support Rust toolchain is **1.68.0**
The current minimum support Rust toolchain is **1.70.0**

## Contribution Guidelines

Expand All @@ -161,7 +161,7 @@ cargo test
...or run tests using a different toolchain:

```sh
rustup run --install 1.68.0 cargo test
rustup run --install 1.70.0 cargo test
```

...or run tests while disabling the default features (e.g. the colors):
Expand Down Expand Up @@ -201,7 +201,7 @@ rustup component add clippy
The linter is always run on the minimum supported Rust version:

```sh
rustup run --install 1.68.0 cargo clippy-mockito
rustup run --install 1.70.0 cargo clippy-mockito
```

### Release
Expand Down
Loading