fix(ecstore): remove duplicate rename_data definitions from merge conflict

Browse Source

PR #7166 (refactor to isolate local object rename commit) extracted
rename_data_inner, rename_data_observed, and LocalRenamePreflightRejection
into disk/local/commit.rs. PR #7163 (drain control writes) was based on
code before the refactor and re-added the same definitions to local.rs,
causing 27 compilation errors (duplicate struct/method definitions and
unresolved helper symbols).

Remove the duplicate block (997 lines) from local.rs; the canonical
definitions in commit.rs are already imported via the module re-export.

Also fix 4 clippy warnings introduced by upstream:
- shared.rs: redundant guard pattern → direct pattern match
- tests.rs: needless struct update, needless borrow, cloned_ref_to_slice_refs

...

This commit is contained in:

overtrue

2026-09-05 20:02:17 +08:00

parent 7ba5cd6888

commit 4dd88becec

3 changed files with 3 additions and 1001 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

crates/ecstore/src/disk/local.rs

-997

File diff suppressed because it is too large Load Diff