Work around latest Rust clippy errors (#3)

Shaptic · Shaptic · commit 0ced9e6dece6 · 2026-03-18T22:48:36.000-07:00
* Bump default core version * Bump built-in soroban-env dependency (cherry picked from commit 36fda74)
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -29,7 +29,7 @@ jobs:
         uses: actions/checkout@v4
       - uses: ./.github/actions/setup-go
         with:
-          go-version: 1.23
+          go-version: 1.25
       - run: rustup update
       - uses: stellar/actions/rust-cache@main
       - run: make build-libs
diff --git a/.github/workflows/stellar-rpc.yml b/.github/workflows/stellar-rpc.yml
@@ -108,8 +108,8 @@ jobs:
       STELLAR_RPC_INTEGRATION_TESTS_CORE_MAX_SUPPORTED_PROTOCOL: ${{ matrix.protocol-version }}
       STELLAR_RPC_INTEGRATION_TESTS_CAPTIVE_CORE_BIN: /usr/bin/stellar-core
       # Use input core_version if provided (workflow_call), otherwise use defaults
-      PROTOCOL_25_CORE_DEBIAN_PKG_VERSION: ${{ inputs.core_version || '25.2.1-3065.1d7e5d7e6.jammy' }}
-      PROTOCOL_25_CORE_DOCKER_IMG: stellar/stellar-core:${{ inputs.core_version || '25.2.1-3065.1d7e5d7e6.jammy' }}
+      PROTOCOL_25_CORE_DEBIAN_PKG_VERSION: ${{ inputs.core_version || '25.2.0-3058.bb195c49d.jammy' }}
+      PROTOCOL_25_CORE_DOCKER_IMG: stellar/stellar-core:${{ inputs.core_version || '25.2.0-3058.bb195c49d.jammy' }}
       CORE_GIT_REF: ${{ inputs.core_git_ref || '' }}
 
     steps:
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,15 +15,15 @@ version = "=24.0.0"
 
 [workspace.dependencies.soroban-env-host-curr]
 package = "soroban-env-host"
-version = "=25.0.0"
+version = "=25.2.1"
 
 [workspace.dependencies.soroban-simulation-prev]
 package = "soroban-simulation"
 version = "=24.0.0"
 
 [workspace.dependencies.soroban-simulation-curr]
 package = "soroban-simulation"
-version = "=25.0.0"
+version = "=25.2.1"
 
 [workspace.dependencies.stellar-xdr]
 version = "=25.0.0"
diff --git a/cmd/stellar-rpc/lib/preflight/src/lib.rs b/cmd/stellar-rpc/lib/preflight/src/lib.rs
@@ -362,7 +362,10 @@ fn free_c_xdr(xdr: CXDR) {
         return;
     }
     unsafe {
-        _ = Vec::from_raw_parts(xdr.xdr, xdr.len, xdr.len);
+        // We intentionally use len for both length and capacity because the
+        // allocation was shrunk to fit (see vec_to_c_array).
+        #[allow(clippy::same_length_and_capacity)]
+        drop(Vec::from_raw_parts(xdr.xdr, xdr.len, xdr.len));
     }
 }
 
@@ -371,6 +374,7 @@ fn free_c_xdr_array(xdr_array: CXDRVector) {
         return;
     }
     unsafe {
+        #[allow(clippy::same_length_and_capacity)]
         let v = Vec::from_raw_parts(xdr_array.array, xdr_array.len, xdr_array.len);
         for xdr in v {
             free_c_xdr(xdr);
@@ -383,6 +387,7 @@ fn free_c_xdr_diff_array(xdr_array: CXDRDiffVector) {
         return;
     }
     unsafe {
+        #[allow(clippy::same_length_and_capacity)]
         let v = Vec::from_raw_parts(xdr_array.array, xdr_array.len, xdr_array.len);
         for diff in v {
             free_c_xdr(diff.before);

Original file line number	Diff line number	Diff line change
`@@ -362,7 +362,10 @@ fn free_c_xdr(xdr: CXDR) {`
`362`	`362`	`return;`
`363`	`363`	`}`
`364`	`364`	`unsafe {`
`365`		`- _ = Vec::from_raw_parts(xdr.xdr, xdr.len, xdr.len);`
	`365`	`+ // We intentionally use len for both length and capacity because the`
	`366`	`+ // allocation was shrunk to fit (see vec_to_c_array).`
	`367`	`+ #[allow(clippy::same_length_and_capacity)]`
	`368`	`+ drop(Vec::from_raw_parts(xdr.xdr, xdr.len, xdr.len));`
`366`	`369`	`}`
`367`	`370`	`}`
`368`	`371`
`@@ -371,6 +374,7 @@ fn free_c_xdr_array(xdr_array: CXDRVector) {`
`371`	`374`	`return;`
`372`	`375`	`}`
`373`	`376`	`unsafe {`
	`377`	`+ #[allow(clippy::same_length_and_capacity)]`
`374`	`378`	`let v = Vec::from_raw_parts(xdr_array.array, xdr_array.len, xdr_array.len);`
`375`	`379`	`for xdr in v {`
`376`	`380`	`free_c_xdr(xdr);`
`@@ -383,6 +387,7 @@ fn free_c_xdr_diff_array(xdr_array: CXDRDiffVector) {`
`383`	`387`	`return;`
`384`	`388`	`}`
`385`	`389`	`unsafe {`
	`390`	`+ #[allow(clippy::same_length_and_capacity)]`
`386`	`391`	`let v = Vec::from_raw_parts(xdr_array.array, xdr_array.len, xdr_array.len);`
`387`	`392`	`for diff in v {`
`388`	`393`	`free_c_xdr(diff.before);`