From 2279c43a2a381f852537c0c58a267e6035300ef6 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Tue, 16 Jul 2024 18:40:53 +0800 Subject: [PATCH 1/2] Upgrade rust-toolchain to 1.75.0 --- .github/workflows/rust.yml | 6 +++--- rust-toolchain | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 1dc7a5db1..b141dd0ae 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -13,7 +13,7 @@ jobs: - name: Install rust uses: actions-rs/toolchain@v1 with: - toolchain: 1.71.1 + toolchain: 1.75.0 components: rustfmt profile: minimal override: true @@ -34,7 +34,7 @@ jobs: - name: Install rust uses: actions-rs/toolchain@v1 with: - toolchain: 1.71.1 + toolchain: 1.75.0 components: clippy profile: minimal override: true @@ -98,7 +98,7 @@ jobs: - name: Install rust uses: actions-rs/toolchain@v1 with: - toolchain: 1.71.1 + toolchain: 1.75.0 target: ${{ matrix.target }} profile: minimal override: true diff --git a/rust-toolchain b/rust-toolchain index 68bc7ff2a..7c7053aa2 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.71.1 +1.75.0 From ebbcad9f1008c71a1d99179aa88a632963902f22 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Tue, 16 Jul 2024 18:41:04 +0800 Subject: [PATCH 2/2] Apply cargo clippy suggestions --- src/backup.rs | 2 +- src/merge_operator.rs | 5 +---- src/ops/multi_get.rs | 6 +++--- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/backup.rs b/src/backup.rs index c11c3296b..d76ffc939 100644 --- a/src/backup.rs +++ b/src/backup.rs @@ -391,7 +391,7 @@ fn restore_from_backup() { assert!(i.size > 0); }); - let backup_id = info.get(0).unwrap().backup_id; + let backup_id = info.first().unwrap().backup_id; let mut restore_option = RestoreOptions::default(); restore_option.set_keep_log_files(false); // true to keep log files let restore_status = backup_engine.restore_from_backup( diff --git a/src/merge_operator.rs b/src/merge_operator.rs index 5fbc4cc62..5ea52e6f8 100644 --- a/src/merge_operator.rs +++ b/src/merge_operator.rs @@ -205,10 +205,7 @@ impl<'a> Iterator for &'a mut MergeOperands { let len = *len_ptr; let ptr = base + (spacing * self.cursor); self.cursor += 1; - Some(slice::from_raw_parts( - *(ptr as *const *const u8) as *const u8, - len, - )) + Some(slice::from_raw_parts(*(ptr as *const *const u8), len)) } } } diff --git a/src/ops/multi_get.rs b/src/ops/multi_get.rs index 10d77d972..3e6dc9825 100644 --- a/src/ops/multi_get.rs +++ b/src/ops/multi_get.rs @@ -283,7 +283,7 @@ where ); pinned_values .into_iter() - .zip(errors.into_iter()) + .zip(errors) .map(|(v, e)| { if e.is_null() { if v.is_null() { @@ -307,8 +307,8 @@ pub fn convert_values( ) -> Vec, Error>> { values .into_iter() - .zip(values_sizes.into_iter()) - .zip(errors.into_iter()) + .zip(values_sizes) + .zip(errors) .map(|((v, s), e)| { if e.is_null() { if v.is_null() {