From 5aae730607a9fde5471729f97dd03bde74499964 Mon Sep 17 00:00:00 2001 From: Egor_P Date: Thu, 15 Aug 2024 10:59:57 +0200 Subject: [PATCH] [Backport] Bump serde_json from 1.0.120 to 1.0.121 in the known_good_semver group (#5169) (#5367) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps the known_good_semver group with 1 update: [serde_json](https://github.com/serde-rs/json). Updates `serde_json` from 1.0.120 to 1.0.121
Release notes

Sourced from serde_json's releases.

v1.0.121

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=serde_json&package-manager=cargo&previous-version=1.0.120&new-version=1.0.121)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
--------- --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Bastian Köcher Co-authored-by: Bastian Köcher --- Cargo.lock | 11 +++++------ Cargo.toml | 2 +- cumulus/primitives/timestamp/Cargo.toml | 12 ++++++------ prdoc/pr_5367.prdoc | 13 +++++++++++++ 4 files changed, 25 insertions(+), 13 deletions(-) create mode 100644 prdoc/pr_5367.prdoc diff --git a/Cargo.lock b/Cargo.lock index 466979cca5125..a23db1a8fcbe6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4145,8 +4145,6 @@ name = "cumulus-primitives-timestamp" version = "0.15.0" dependencies = [ "cumulus-primitives-core", - "futures", - "parity-scale-codec", "sp-inherents", "sp-timestamp", ] @@ -8380,9 +8378,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memfd" @@ -18634,12 +18632,13 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "4ab380d7d9f22ef3f21ad3e6c1ebe8e4fc7a2000ccba2e4d71fc96f15b2cb609" dependencies = [ "indexmap 2.2.3", "itoa", + "memchr", "ryu", "serde", ] diff --git a/Cargo.toml b/Cargo.toml index 35913e86d62ee..ae2a8f79c0559 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1165,7 +1165,7 @@ separator = { version = "0.4.1" } serde = { version = "1.0.197", default-features = false } serde-big-array = { version = "0.3.2" } serde_derive = { version = "1.0.117" } -serde_json = { version = "1.0.114", default-features = false } +serde_json = { version = "1.0.121", default-features = false } serde_yaml = { version = "0.9" } serial_test = { version = "2.0.0" } sha1 = { version = "0.10.6" } diff --git a/cumulus/primitives/timestamp/Cargo.toml b/cumulus/primitives/timestamp/Cargo.toml index 6eeec50b36fea..c42e2126c0a79 100644 --- a/cumulus/primitives/timestamp/Cargo.toml +++ b/cumulus/primitives/timestamp/Cargo.toml @@ -10,16 +10,16 @@ license = "Apache-2.0" workspace = true [dependencies] -codec = { features = ["derive"], workspace = true } -futures = { workspace = true } -sp-inherents.workspace = true -sp-timestamp.workspace = true -cumulus-primitives-core.workspace = true +# Substrate +sp-inherents = { workspace = true } +sp-timestamp = { workspace = true } + +# Cumulus +cumulus-primitives-core = { workspace = true } [features] default = ["std"] std = [ - "codec/std", "cumulus-primitives-core/std", "sp-inherents/std", "sp-timestamp/std", diff --git a/prdoc/pr_5367.prdoc b/prdoc/pr_5367.prdoc new file mode 100644 index 0000000000000..a87d2bdcdc41b --- /dev/null +++ b/prdoc/pr_5367.prdoc @@ -0,0 +1,13 @@ +# Schema: Polkadot SDK PRDoc Schema (prdoc) v1.0.0 +# See doc at https://raw.githubusercontent.com/paritytech/polkadot-sdk/master/prdoc/schema_user.json + +title: Fixes `std` leaking into the WASM runtime build + +doc: + - audience: Runtime Dev + description: | + Fixes `std` leaking into the WASM runtime build when updating `serde_json`. + +crates: + - name: cumulus-primitives-timestamp + bump: patch