Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade rust toolchain to 1.75.0 #53

Open
wants to merge 2 commits into
base: txn
Choose a base branch
from
Open

Upgrade rust toolchain to 1.75.0 #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2279c43
Upgrade rust-toolchain to 1.75.0
eval-exec Jul 16, 2024
ebbcad9
Apply cargo clippy suggestions
eval-exec Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.71.1
1.75.0
2 changes: 1 addition & 1 deletion src/backup.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
5 changes: 1 addition & 4 deletions src/merge_operator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/ops/multi_get.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -307,8 +307,8 @@ pub fn convert_values(
) -> Vec<Result<Option<DBVector>, 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() {
Expand Down
Loading