From 598fc2b0923339d8d8afdd66d2fa4aa018f2d804 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Tue, 8 Feb 2022 10:59:30 -0800 Subject: [PATCH] Prepare for indexmap 1.9.0, with MSRV 1.56 (cherry picked from commit 61bb73ed5d5b6c092a7ffe43f193db38497c1df2) --- .github/workflows/ci.yml | 4 ++-- .rustfmt.toml | 2 +- Cargo.toml | 28 ++++++---------------------- README.rst | 4 ++-- src/lib.rs | 2 +- test-nostd/Cargo.toml | 3 +-- test-serde/Cargo.toml | 3 +-- 7 files changed, 14 insertions(+), 32 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 13696ee..8c6c10c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: include: - - rust: 1.49.0 # MSRV + - rust: 1.56.0 # MSRV features: - rust: stable features: serde @@ -59,7 +59,7 @@ jobs: strategy: matrix: include: - - rust: 1.49.0 + - rust: 1.56.0 target: thumbv6m-none-eabi - rust: stable target: thumbv6m-none-eabi diff --git a/.rustfmt.toml b/.rustfmt.toml index 32a9786..3a26366 100644 --- a/.rustfmt.toml +++ b/.rustfmt.toml @@ -1 +1 @@ -edition = "2018" +edition = "2021" diff --git a/Cargo.toml b/Cargo.toml index b8848f3..7ebffe6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,37 +1,21 @@ [package] name = "indexmap" -edition = "2018" -version = "1.8.2" -authors = [ -"bluss", -"Josh Stone " -] +edition = "2021" +version = "1.9.0" documentation = "https://docs.rs/indexmap/" repository = "https://github.com/bluss/indexmap" -license = "Apache-2.0/MIT" -description = """ -A hash table with consistent order and fast iteration. - -The indexmap is a hash table where the iteration order of the key-value -pairs is independent of the hash values of the keys. It has the usual -hash table functionality, it preserves insertion order except after -removals, and it allows lookup of its elements by either hash table key -or numerical index. A corresponding hash set type is also provided. - -This crate was initially published under the name ordermap, but it was renamed to -indexmap. -""" - +license = "Apache-2.0 OR MIT" +description = "A hash table with consistent order and fast iteration." keywords = ["hashmap", "no_std"] categories = ["data-structures", "no-std"] - -build = "build.rs" +rust-version = "1.56" [lib] bench = false [build-dependencies] autocfg = "1" + [dependencies] serde = { version = "1.0", optional = true, default-features = false } rayon = { version = "1.4.1", optional = true } diff --git a/README.rst b/README.rst index da76a68..4dac24f 100644 --- a/README.rst +++ b/README.rst @@ -12,8 +12,8 @@ indexmap .. |docs| image:: https://docs.rs/indexmap/badge.svg .. _docs: https://docs.rs/indexmap -.. |rustc| image:: https://img.shields.io/badge/rust-1.49%2B-orange.svg -.. _rustc: https://img.shields.io/badge/rust-1.49%2B-orange.svg +.. |rustc| image:: https://img.shields.io/badge/rust-1.56%2B-orange.svg +.. _rustc: https://img.shields.io/badge/rust-1.56%2B-orange.svg A pure-Rust hash table which preserves (in a limited sense) insertion order. diff --git a/src/lib.rs b/src/lib.rs index 8c44d7b..ba61334 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -53,7 +53,7 @@ //! //! ### Rust Version //! -//! This version of indexmap requires Rust 1.49 or later. +//! This version of indexmap requires Rust 1.56 or later. //! //! The indexmap 1.x release series will use a carefully considered version //! upgrade policy, where in a later 1.x version, we will raise the minimum diff --git a/test-nostd/Cargo.toml b/test-nostd/Cargo.toml index 0201a72..3ae606d 100644 --- a/test-nostd/Cargo.toml +++ b/test-nostd/Cargo.toml @@ -1,9 +1,8 @@ [package] name = "test-nostd" version = "0.1.0" -authors = ["bluss"] publish = false -edition = "2018" +edition = "2021" [dependencies] indexmap = { path = "..", features = ["serde-1"] } diff --git a/test-serde/Cargo.toml b/test-serde/Cargo.toml index f7abc9e..791c0a3 100644 --- a/test-serde/Cargo.toml +++ b/test-serde/Cargo.toml @@ -1,9 +1,8 @@ [package] name = "test-serde" version = "0.1.0" -authors = ["bluss"] publish = false -edition = "2018" +edition = "2021" [dependencies]