Upgrade Rust 1.75.0 nightly (#4018)

* upgrade rust to 1.75.0 nightly - 2023-11-0 * Update sgx/compat/src/lib.rs --------- Co-authored-by: Nick Santana <[email protected]>
mobilecoinfoundation · Dec 11, 2024 · ca96834 · ca96834
1 parent a3f2259
commit ca96834
Show file tree

Hide file tree

Showing 40 changed files with 124 additions and 162 deletions.
diff --git a/.cargo/config → .cargo/config.toml b/.cargo/config → .cargo/config.toml
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/api/src/convert/amount.rs b/api/src/convert/amount.rs
@@ -149,7 +149,7 @@ mod tests {
         let amount = Amount::new(10000, TokenId::from(10));
 
         let external_amount: external::Amount = (&amount).into();
-        let recovered_amount: Amount = (&external_amount).try_into().unwrap();
+        let recovered_amount: Amount = (&external_amount).into();
 
         assert_eq!(amount, recovered_amount);
     }

diff --git a/api/src/convert/block_metadata.rs b/api/src/convert/block_metadata.rs
@@ -34,11 +34,11 @@ impl TryFrom<&blockchain::BlockMetadataContents> for BlockMetadataContents {
         let quorum_set = src.get_quorum_set().try_into()?;
         let attestation_evidence = match &src.attestation_evidence {
             Some(BlockMetadataContents_oneof_attestation_evidence::dcap_evidence(evidence)) => {
-                let evidence = evidence.try_into()?;
+                let evidence = evidence.into();
                 AttestationEvidence::DcapEvidence(evidence)
             }
             Some(BlockMetadataContents_oneof_attestation_evidence::verification_report(report)) => {
-                let report = report.try_into()?;
+                let report = report.into();
                 AttestationEvidence::VerificationReport(report)
             }
             None => {

diff --git a/api/src/convert/dcap_evidence.rs b/api/src/convert/dcap_evidence.rs
@@ -18,7 +18,7 @@ impl TryFrom<&DcapEvidence> for external::DcapEvidence {
 impl TryFrom<&external::DcapEvidence> for DcapEvidence {
     type Error = ConversionError;
     fn try_from(src: &external::DcapEvidence) -> Result<Self, Self::Error> {
-        let prost = prost::DcapEvidence::try_from(src)?;
+        let prost = prost::DcapEvidence::from(src);
         Ok((&prost).try_into()?)
     }
 }

diff --git a/api/src/convert/output_secret.rs b/api/src/convert/output_secret.rs
@@ -19,10 +19,7 @@ impl TryFrom<&external::OutputSecret> for OutputSecret {
 
     fn try_from(source: &external::OutputSecret) -> Result<Self, Self::Error> {
         Ok(OutputSecret {
-            amount: source
-                .get_amount()
-                .try_into()
-                .map_err(|_| ConversionError::KeyCastError)?,
+            amount: source.get_amount().into(),
             blinding: source.get_blinding().try_into()?,
         })
     }