Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto-fix clippy::collapsible_if violations (#36428)

Browse source 
Release Notes:

- N/A
This commit is contained in:
Piotr Osiewicz 2025-08-19 15:27:24 +02:00 • committed by GitHub
parent 9e8ec72bd5
commit 8f567383e4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
281 changed files with 6628 additions and 7089 deletions
Download patch file Download diff file Expand all files Collapse all files

36
crates/terminal/src/terminal.rs
View file

@ -1051,15 +1051,16 @@ impl Terminal {
navigation_target: MaybeNavigationTarget,
cx: &mut Context<Self>,
) {
if let Some(prev_word) = prev_word {
if prev_word.word == word && prev_word.word_match == word_match {
self.last_content.last_hovered_word = Some(HoveredWord {
word,
word_match,
id: prev_word.id,
});
return;
}
if let Some(prev_word) = prev_word
&& prev_word.word == word
&& prev_word.word_match == word_match
{
self.last_content.last_hovered_word = Some(HoveredWord {
word,
word_match,
id: prev_word.id,
});
return;
}
self.last_content.last_hovered_word = Some(HoveredWord {
@ -1517,12 +1518,11 @@ impl Terminal {
self.last_content.display_offset,
);
if self.mouse_changed(point, side) {
if let Some(bytes) =
if self.mouse_changed(point, side)
&& let Some(bytes) =
mouse_moved_report(point, e.pressed_button, e.modifiers, self.last_content.mode)
{
self.pty_tx.notify(bytes);
}
{
self.pty_tx.notify(bytes);
}
} else if e.modifiers.secondary() {
self.word_from_position(e.position);
@ -1864,10 +1864,10 @@ impl Terminal {
}
pub fn kill_active_task(&mut self) {
if let Some(task) = self.task() {
if task.status == TaskStatus::Running {
self.pty_info.kill_current_process();
}
if let Some(task) = self.task()
&& task.status == TaskStatus::Running
{
self.pty_info.kill_current_process();
}
}

8
crates/terminal/src/terminal_settings.rs
View file

@ -325,10 +325,10 @@ impl settings::Settings for TerminalSettings {
.and_then(|v| v.as_object())
{
for (k, v) in env {
if v.is_null() {
if let Some(zed_env) = current.env.as_mut() {
zed_env.remove(k);
}
if v.is_null()
&& let Some(zed_env) = current.env.as_mut()
{
zed_env.remove(k);
}
let Some(v) = v.as_str() else { continue };
if let Some(zed_env) = current.env.as_mut() {