From b743fd3f9c81916eb0238912399a344d67e23011 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 6 Oct 2023 13:03:22 +0000 Subject: [PATCH 1/2] Update rust-version --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index cb0a31fe..7ced208d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ authors = ["Stellar Development Foundation "] license = "Apache-2.0" version = "20.0.0-rc1" edition = "2021" -rust-version = "1.72" +rust-version = "1.73" [[bin]] name = "stellar-xdr" From 91d58ee83e40ef552f1d0ed5b24c568e3e47e058 Mon Sep 17 00:00:00 2001 From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com> Date: Wed, 22 Nov 2023 21:48:16 -0800 Subject: [PATCH 2/2] fix --- src/curr/scval_conversions.rs | 10 +++++----- src/next/scval_conversions.rs | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/curr/scval_conversions.rs b/src/curr/scval_conversions.rs index e15102d7..49f2a173 100644 --- a/src/curr/scval_conversions.rs +++ b/src/curr/scval_conversions.rs @@ -96,7 +96,7 @@ impl TryFrom for i64 { } impl From<()> for ScVal { - fn from(_: ()) -> Self { + fn from((): ()) -> Self { ScVal::Void } } @@ -304,7 +304,7 @@ impl TryFrom for ScSymbol { impl TryFrom for ScVal { type Error = (); fn try_from(v: String) -> Result { - Ok(ScVal::Symbol(v.try_into().map_err(|_| ())?)) + Ok(ScVal::Symbol(v.try_into().map_err(|()| ())?)) } } @@ -312,7 +312,7 @@ impl TryFrom for ScVal { impl TryFrom<&String> for ScVal { type Error = (); fn try_from(v: &String) -> Result { - Ok(ScVal::Symbol(v.try_into().map_err(|_| ())?)) + Ok(ScVal::Symbol(v.try_into().map_err(|()| ())?)) } } @@ -336,7 +336,7 @@ impl TryFrom<&String> for ScSymbol { impl TryFrom<&str> for ScVal { type Error = (); fn try_from(v: &str) -> Result { - Ok(ScVal::Symbol(v.try_into().map_err(|_| ())?)) + Ok(ScVal::Symbol(v.try_into().map_err(|()| ())?)) } } @@ -344,7 +344,7 @@ impl TryFrom<&str> for ScVal { impl TryFrom<&'static str> for ScVal { type Error = (); fn try_from(v: &'static str) -> Result { - Ok(ScVal::Symbol(v.try_into().map_err(|_| ())?)) + Ok(ScVal::Symbol(v.try_into().map_err(|()| ())?)) } } diff --git a/src/next/scval_conversions.rs b/src/next/scval_conversions.rs index e15102d7..49f2a173 100644 --- a/src/next/scval_conversions.rs +++ b/src/next/scval_conversions.rs @@ -96,7 +96,7 @@ impl TryFrom for i64 { } impl From<()> for ScVal { - fn from(_: ()) -> Self { + fn from((): ()) -> Self { ScVal::Void } } @@ -304,7 +304,7 @@ impl TryFrom for ScSymbol { impl TryFrom for ScVal { type Error = (); fn try_from(v: String) -> Result { - Ok(ScVal::Symbol(v.try_into().map_err(|_| ())?)) + Ok(ScVal::Symbol(v.try_into().map_err(|()| ())?)) } } @@ -312,7 +312,7 @@ impl TryFrom for ScVal { impl TryFrom<&String> for ScVal { type Error = (); fn try_from(v: &String) -> Result { - Ok(ScVal::Symbol(v.try_into().map_err(|_| ())?)) + Ok(ScVal::Symbol(v.try_into().map_err(|()| ())?)) } } @@ -336,7 +336,7 @@ impl TryFrom<&String> for ScSymbol { impl TryFrom<&str> for ScVal { type Error = (); fn try_from(v: &str) -> Result { - Ok(ScVal::Symbol(v.try_into().map_err(|_| ())?)) + Ok(ScVal::Symbol(v.try_into().map_err(|()| ())?)) } } @@ -344,7 +344,7 @@ impl TryFrom<&str> for ScVal { impl TryFrom<&'static str> for ScVal { type Error = (); fn try_from(v: &'static str) -> Result { - Ok(ScVal::Symbol(v.try_into().map_err(|_| ())?)) + Ok(ScVal::Symbol(v.try_into().map_err(|()| ())?)) } }