From 830528d5b109fc1e8a0c4cbe720d88e881b12088 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Sun, 30 Jul 2023 21:41:07 -0700 Subject: [PATCH] Update to 2018 edition --- .github/workflows/ci.yml | 22 ++++++++-------------- README.md | 6 +++--- serde/Cargo.toml | 3 ++- 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b5afdae0c..4fb72c48a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -72,28 +72,22 @@ jobs: if: matrix.os != 'windows' build: - name: Rust 1.34.0 + name: Rust ${{matrix.rust}} runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + rust: [1.31.0, 1.34.0] timeout-minutes: 45 steps: - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@1.34.0 + - uses: dtolnay/rust-toolchain@master + with: + toolchain: ${{matrix.rust}} - run: cd serde && cargo build --features rc - run: cd serde && cargo build --no-default-features - run: cd serde && cargo build - more: - name: Rust 1.30.0 - runs-on: ubuntu-latest - timeout-minutes: 45 - steps: - - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@1.30.0 - # Work around failing to parse manifest because editions are unstable. - - run: sed -i /test_suite/d Cargo.toml - - run: cd serde && cargo build --no-default-features - - run: cd serde && cargo build - derive: name: Rust 1.56.0 runs-on: ubuntu-latest diff --git a/README.md b/README.md index 91bda35b2..477fd3647 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -# Serde   [![Build Status]][actions] [![Latest Version]][crates.io] [![serde: rustc 1.30+]][Rust 1.30] [![serde_derive: rustc 1.56+]][Rust 1.56] +# Serde   [![Build Status]][actions] [![Latest Version]][crates.io] [![serde: rustc 1.31+]][Rust 1.31] [![serde_derive: rustc 1.56+]][Rust 1.56] [Build Status]: https://img.shields.io/github/actions/workflow/status/serde-rs/serde/ci.yml?branch=master [actions]: https://github.com/serde-rs/serde/actions?query=branch%3Amaster [Latest Version]: https://img.shields.io/crates/v/serde.svg [crates.io]: https://crates.io/crates/serde -[serde: rustc 1.30+]: https://img.shields.io/badge/serde-rustc_1.30+-lightgray.svg +[serde: rustc 1.31+]: https://img.shields.io/badge/serde-rustc_1.31+-lightgray.svg [serde_derive: rustc 1.56+]: https://img.shields.io/badge/serde_derive-rustc_1.56+-lightgray.svg -[Rust 1.30]: https://blog.rust-lang.org/2018/10/25/Rust-1.30.0.html +[Rust 1.31]: https://blog.rust-lang.org/2018/12/06/Rust-1.31-and-rust-2018.html [Rust 1.56]: https://blog.rust-lang.org/2021/10/21/Rust-1.56.0.html **Serde is a framework for *ser*ializing and *de*serializing Rust data structures efficiently and generically.** diff --git a/serde/Cargo.toml b/serde/Cargo.toml index 755339c9a..64c245ca7 100644 --- a/serde/Cargo.toml +++ b/serde/Cargo.toml @@ -6,12 +6,13 @@ build = "build.rs" categories = ["encoding", "no-std", "no-std::no-alloc"] description = "A generic serialization/deserialization framework" documentation = "https://docs.rs/serde" +edition = "2018" homepage = "https://serde.rs" keywords = ["serde", "serialization", "no_std"] license = "MIT OR Apache-2.0" readme = "crates-io.md" repository = "https://github.com/serde-rs/serde" -rust-version = "1.30" +rust-version = "1.31" [dependencies] serde_derive = { version = "=1.0.179", optional = true, path = "../serde_derive" }