Fix a bunch of other low-hanging style lints (#36498)
- **Fix a bunch of low hanging style lints like unnecessary-return** - **Fix single worktree violation** - **And the rest** Release Notes: - N/A
This commit is contained in:
@@ -57,7 +57,7 @@ where
|
||||
// Push the old edit if its new end is before the new edit's old start.
|
||||
if let Some(old_edit) = old_edit.as_ref() {
|
||||
let new_edit = new_edit.as_ref();
|
||||
if new_edit.map_or(true, |new_edit| old_edit.new.end < new_edit.old.start) {
|
||||
if new_edit.is_none_or(|new_edit| old_edit.new.end < new_edit.old.start) {
|
||||
let catchup = old_edit.old.start - old_start;
|
||||
old_start += catchup;
|
||||
new_start += catchup;
|
||||
@@ -78,7 +78,7 @@ where
|
||||
// Push the new edit if its old end is before the old edit's new start.
|
||||
if let Some(new_edit) = new_edit.as_ref() {
|
||||
let old_edit = old_edit.as_ref();
|
||||
if old_edit.map_or(true, |old_edit| new_edit.old.end < old_edit.new.start) {
|
||||
if old_edit.is_none_or(|old_edit| new_edit.old.end < old_edit.new.start) {
|
||||
let catchup = new_edit.new.start - new_start;
|
||||
old_start += catchup;
|
||||
new_start += catchup;
|
||||
|
||||
Reference in New Issue
Block a user