diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7740d63..a92d664 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,14 +16,14 @@ jobs: run: make test build-stable: - name: Build on 1.41.0 + name: Build on 1.60.0 runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - uses: dtolnay/rust-toolchain@master with: - toolchain: 1.41.0 + toolchain: 1.60.0 - name: Use Cargo.lock.msrv run: cp Cargo.lock.msrv Cargo.lock - name: Test diff --git a/CHANGELOG.md b/CHANGELOG.md index 488a6d7..81074da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ All notable changes to similar are documented here. ## 2.5.0 * Added support for `TextDiff::iter_inline_changes_deadline`. #61 +* Raise MSRV to 1.60. +* Bump bstr dependency to 1.0. ## 2.4.0 diff --git a/Cargo.lock.msrv b/Cargo.lock.msrv index ea52d29..b60b90e 100644 --- a/Cargo.lock.msrv +++ b/Cargo.lock.msrv @@ -41,7 +41,7 @@ dependencies = [ "console", "lazy_static", "linked-hash-map", - "similar 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "similar 2.2.1", "yaml-rust", ] @@ -139,6 +139,12 @@ dependencies = [ [[package]] name = "similar" version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" + +[[package]] +name = "similar" +version = "2.4.0" dependencies = [ "bstr", "console", @@ -148,12 +154,6 @@ dependencies = [ "unicode-segmentation", ] -[[package]] -name = "similar" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" - [[package]] name = "syn" version = "1.0.109" diff --git a/README.md b/README.md index 75b6c6c..5713676 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![Build Status](https://github.com/mitsuhiko/similar/workflows/Tests/badge.svg?branch=main)](https://github.com/mitsuhiko/similar/actions?query=workflow%3ATests) [![Crates.io](https://img.shields.io/crates/d/similar.svg)](https://crates.io/crates/similar) [![License](https://img.shields.io/github/license/mitsuhiko/similar)](https://github.com/mitsuhiko/similar/blob/main/LICENSE) -[![rustc 1.41.0](https://img.shields.io/badge/rust-1.41%2B-orange.svg)](https://img.shields.io/badge/rust-1.41%2B-orange.svg) +[![rustc 1.60.0](https://img.shields.io/badge/rust-1.60%2B-orange.svg)](https://img.shields.io/badge/rust-1.60%2B-orange.svg) [![Documentation](https://docs.rs/similar/badge.svg)](https://docs.rs/similar) Similar is a dependency free crate for Rust that implements different diffing diff --git a/clippy.toml b/clippy.toml index 88924a5..16caf02 100644 --- a/clippy.toml +++ b/clippy.toml @@ -1 +1 @@ -msrv = "1.41.0" +msrv = "1.60.0"