andras/vault-link
1
0
Fork 0
Code Issues Pull requests 18 Projects Releases 55 Packages Wiki Activity Actions 1

Update rust

Browse source
This commit is contained in:
Andras Schmelczer 2025-06-07 12:09:02 +01:00
parent a628ff348e
commit 3abe028d74
No known key found for this signature in database
GPG key ID: FC8F2C3D3D1A718C
3 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
backend/Cargo.toml
View file

@ -43,7 +43,6 @@ inefficient_to_string = "warn"
linkedlist = "warn"
lossy_float_literal = "warn"
macro_use_imports = "warn"
match_on_vec_items = "warn"
match_wildcard_for_single_variants = "warn"
mem_forget = "warn"
needless_borrow = "warn"

9
backend/reconcile/src/operation_transformation/merge_context.rs
View file

@ -62,12 +62,11 @@ where
self.shift -= *deleted_character_count as i64;
self.last_operation = None;
}
} else if let Operation::Insert { .. } = last_operation {
if threshold_index + self.shift - last_operation.len() as i64
} else if let Operation::Insert { .. } = last_operation
&& threshold_index + self.shift - last_operation.len() as i64
> last_operation.end_index() as i64
{
self.last_operation = None;
}
{
self.last_operation = None;
}
}
}

2
backend/rust-toolchain.toml
View file

@ -1,4 +1,4 @@
[toolchain]
channel = "nightly-2025-03-14"
channel = "nightly-2025-06-06"
targets = [ "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl" ]
profile = "default"