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:
Piotr Osiewicz
2025-08-19 21:26:17 +02:00
committed by GitHub
parent df9c2aefb1
commit 05fc0c432c
239 changed files with 854 additions and 1015 deletions
@@ -146,7 +146,7 @@ impl DapLocator for CargoLocator {
let is_test = build_config
.args
.first()
.map_or(false, |arg| arg == "test" || arg == "t");
.is_some_and(|arg| arg == "test" || arg == "t");
let executables = output
.lines()
@@ -28,9 +28,7 @@ impl DapLocator for PythonLocator {
let valid_program = build_config.command.starts_with("$ZED_")
|| Path::new(&build_config.command)
.file_name()
.map_or(false, |name| {
name.to_str().is_some_and(|path| path.starts_with("python"))
});
.is_some_and(|name| name.to_str().is_some_and(|path| path.starts_with("python")));
if !valid_program || build_config.args.iter().any(|arg| arg == "-c") {
// We cannot debug selections.
return None;
+1 -1
View File
@@ -329,7 +329,7 @@ impl Iterator for MemoryIterator {
}
if !self.fetch_next_page() {
self.start += 1;
return Some(MemoryCell(None));
Some(MemoryCell(None))
} else {
self.next()
}
+3 -5
View File
@@ -431,7 +431,7 @@ impl RunningMode {
let should_send_exception_breakpoints = capabilities
.exception_breakpoint_filters
.as_ref()
.map_or(false, |filters| !filters.is_empty())
.is_some_and(|filters| !filters.is_empty())
|| !configuration_done_supported;
let supports_exception_filters = capabilities
.supports_exception_filter_options
@@ -710,9 +710,7 @@ where
T: LocalDapCommand + PartialEq + Eq + Hash,
{
fn dyn_eq(&self, rhs: &dyn CacheableCommand) -> bool {
(rhs as &dyn Any)
.downcast_ref::<Self>()
.map_or(false, |rhs| self == rhs)
(rhs as &dyn Any).downcast_ref::<Self>() == Some(self)
}
fn dyn_hash(&self, mut hasher: &mut dyn Hasher) {
@@ -1085,7 +1083,7 @@ impl Session {
})
.detach();
return tx;
tx
}
pub fn is_started(&self) -> bool {