From 008fcfd1ad4cbaa4b38fc04c5885c28ad94ba11e Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Fri, 25 Nov 2022 11:01:59 +0100 Subject: [PATCH 1/3] Upgrade Rust to 1.59.0 --- .github/workflows/Basic.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Basic.yml b/.github/workflows/Basic.yml index 9035d61f..ca38b67d 100644 --- a/.github/workflows/Basic.yml +++ b/.github/workflows/Basic.yml @@ -17,7 +17,7 @@ jobs: uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.40.0 + toolchain: 1.59.0 target: wasm32-unknown-unknown override: true @@ -50,7 +50,7 @@ jobs: uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.49.0 + toolchain: 1.59.0 override: true components: rustfmt, clippy From 1248a066e0c1d360ef9c7babac562d054be35ab0 Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Fri, 25 Nov 2022 11:04:59 +0100 Subject: [PATCH 2/3] Format CHANGELOG with prettier --- .editorconfig | 6 ++++-- CHANGELOG.md | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.editorconfig b/.editorconfig index c1e2c643..4b0d3a35 100644 --- a/.editorconfig +++ b/.editorconfig @@ -5,8 +5,10 @@ root = true [*] indent_style = space -indent_size = 4 -end_of_line = lf +indent_size = 2 charset = utf-8 trim_trailing_whitespace = true insert_final_newline = true + +[*.rs] +indent_size = 4 diff --git a/CHANGELOG.md b/CHANGELOG.md index fda35677..6efdba9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,11 +8,13 @@ project adheres to [Semantic Versioning](http://semver.org/). ## [0.4.1] - 2022-05-05 ### Changed + - Properly serialize `u128`/`i128` types when embedded in structs ## [0.4.0] - 2022-03-29 ### Added + - Add support for `#[serde(untagged)]` enums representation ## [0.3.1] - 2021-01-19 @@ -26,6 +28,7 @@ project adheres to [Semantic Versioning](http://semver.org/). ### Changed Maintenance release: + - Update clippy version in CI to 1.49.0. - Fix `clippy::manual-non-exhaustive` warnings. From 908b1d032ed4288a2b0a53d1cf49ca785d138961 Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Fri, 25 Nov 2022 11:05:23 +0100 Subject: [PATCH 3/3] Bump edition to 2021 --- CHANGELOG.md | 7 +++++++ Cargo.toml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6efdba9a..85001393 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## Unreleased + +### Changed + +- Bump min supported Rust version to 1.59.0 (same as cosmwasm-std) +- Upgrade codebase to Rust edition 2021 + ## [0.4.1] - 2022-05-05 ### Changed diff --git a/Cargo.toml b/Cargo.toml index 5ffafaf8..48b66ec7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ authors = [ categories = ["wasm"] description = "serde_json for Wasm programs (small, deterministic, no floats)" documentation = "https://docs.rs/serde-json-wasm" -edition = "2018" +edition = "2021" keywords = ["serde", "json", "wasm"] license = "MIT OR Apache-2.0" name = "serde-json-wasm"