diff options
| author | Matthew Maurer <mmaurer@google.com> | 2023-05-26 23:02:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-05-26 23:02:45 +0000 |
| commit | d0710b088b307842f64323d7aa55ce2be72954f4 (patch) | |
| tree | 267f8dff3c5aa9d6e3e79e8841462a58405f0038 | |
| parent | 777d189cbf150362aa39ea4d01eecb1738014777 (diff) | |
| parent | 1f02315b81e9ad6390b91caac8d0dcac63c83845 (diff) | |
| download | serde_json-d0710b088b307842f64323d7aa55ce2be72954f4.tar.gz | |
Upgrade serde_json to 1.0.94 am: e536f09470 am: 1f02315b81
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_json/+/2498159
Change-Id: I86d66e2a52fa49512f50dd50851e8de72fcc96e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | .cargo_vcs_info.json | 2 | ||||
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | Cargo.toml | 4 | ||||
| -rw-r--r-- | Cargo.toml.orig | 2 | ||||
| -rw-r--r-- | METADATA | 8 | ||||
| -rw-r--r-- | src/error.rs | 2 | ||||
| -rw-r--r-- | src/lib.rs | 3 | ||||
| -rw-r--r-- | tests/lexical.rs | 1 | ||||
| -rw-r--r-- | tests/test.rs | 1 |
9 files changed, 14 insertions, 11 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json index 3fa35ed..d3c2d3e 100644 --- a/.cargo_vcs_info.json +++ b/.cargo_vcs_info.json @@ -1,6 +1,6 @@ { "git": { - "sha1": "0ebeede28a0d5f0f07f18124078f55d62b180a2d" + "sha1": "a15bd0968639884ec7b73107360d58fd655e2071" }, "path_in_vcs": "" }
\ No newline at end of file @@ -43,7 +43,7 @@ rust_library { host_supported: true, crate_name: "serde_json", cargo_env_compat: true, - cargo_pkg_version: "1.0.93", + cargo_pkg_version: "1.0.94", srcs: ["src/lib.rs"], edition: "2018", features: [ @@ -13,7 +13,7 @@ edition = "2018" rust-version = "1.36" name = "serde_json" -version = "1.0.93" +version = "1.0.94" authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>", @@ -39,11 +39,11 @@ features = [ "raw_value", "unbounded_depth", ] -targets = ["x86_64-unknown-linux-gnu"] rustdoc-args = [ "--cfg", "docsrs", ] +targets = ["x86_64-unknown-linux-gnu"] [package.metadata.playground] features = ["raw_value"] diff --git a/Cargo.toml.orig b/Cargo.toml.orig index 3e8fa0d..ee54284 100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -1,6 +1,6 @@ [package] name = "serde_json" -version = "1.0.93" # remember to update html_root_url +version = "1.0.94" # remember to update html_root_url authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"] categories = ["encoding", "parser-implementations", "no-std"] description = "A JSON serialization file format" @@ -11,13 +11,13 @@ third_party { } url { type: ARCHIVE - value: "https://static.crates.io/crates/serde_json/serde_json-1.0.93.crate" + value: "https://static.crates.io/crates/serde_json/serde_json-1.0.94.crate" } - version: "1.0.93" + version: "1.0.94" license_type: NOTICE last_upgrade_date { year: 2023 - month: 2 - day: 17 + month: 3 + day: 20 } } diff --git a/src/error.rs b/src/error.rs index 1875ef0..0898baf 100644 --- a/src/error.rs +++ b/src/error.rs @@ -319,7 +319,7 @@ impl serde::de::StdError for Error { #[cfg(feature = "std")] fn source(&self) -> Option<&(dyn error::Error + 'static)> { match &self.err.code { - ErrorCode::Io(err) => Some(err), + ErrorCode::Io(err) => err.source(), _ => None, } } @@ -300,7 +300,7 @@ //! [macro]: crate::json //! [`serde-json-core`]: https://github.com/rust-embedded-community/serde-json-core -#![doc(html_root_url = "https://docs.rs/serde_json/1.0.93")] +#![doc(html_root_url = "https://docs.rs/serde_json/1.0.94")] // Ignored clippy lints #![allow( clippy::collapsible_else_if, @@ -338,6 +338,7 @@ clippy::enum_glob_use, clippy::if_not_else, clippy::integer_division, + clippy::let_underscore_untyped, clippy::map_err_ignore, clippy::match_same_arms, clippy::similar_names, diff --git a/tests/lexical.rs b/tests/lexical.rs index 6e0f07b..d3dfb85 100644 --- a/tests/lexical.rs +++ b/tests/lexical.rs @@ -9,6 +9,7 @@ clippy::excessive_precision, clippy::float_cmp, clippy::if_not_else, + clippy::let_underscore_untyped, clippy::module_name_repetitions, clippy::needless_late_init, clippy::shadow_unrelated, diff --git a/tests/test.rs b/tests/test.rs index f62a545..6c08cc8 100644 --- a/tests/test.rs +++ b/tests/test.rs @@ -6,6 +6,7 @@ clippy::excessive_precision, clippy::float_cmp, clippy::items_after_statements, + clippy::let_underscore_untyped, clippy::shadow_unrelated, clippy::too_many_lines, clippy::unreadable_literal, |