diff options
| author | Lukas Wirth <me@lukaswirth.dev> | 2025-07-06 08:01:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-06 08:01:10 +0000 |
| commit | 37f22634389e1c828ebc0cfaa114c7d24a9e80fa (patch) | |
| tree | 3a9c5c119c54b580cd270b000362495aa3637f68 /src/tools | |
| parent | bc10a252847be89f9841d165980921202d92a677 (diff) | |
| parent | e779ea0ea7b39c235baac816772829111e61511b (diff) | |
| download | rust-37f22634389e1c828ebc0cfaa114c7d24a9e80fa.tar.gz rust-37f22634389e1c828ebc0cfaa114c7d24a9e80fa.zip | |
Merge pull request #20126 from Wilfred/no_unwrap_in_discover_projects
fix: Avoid .unwrap() when running the discover command
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/rust-analyzer/crates/rust-analyzer/src/main_loop.rs | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/tools/rust-analyzer/crates/rust-analyzer/src/main_loop.rs b/src/tools/rust-analyzer/crates/rust-analyzer/src/main_loop.rs index 0c0438c4b8f..00cf890510d 100644 --- a/src/tools/rust-analyzer/crates/rust-analyzer/src/main_loop.rs +++ b/src/tools/rust-analyzer/crates/rust-analyzer/src/main_loop.rs @@ -783,9 +783,14 @@ impl GlobalState { DiscoverProjectParam::Path(it) => DiscoverArgument::Path(it), }; - let handle = - discover.spawn(arg, &std::env::current_dir().unwrap()).unwrap(); - self.discover_handle = Some(handle); + let handle = discover.spawn( + arg, + &std::env::current_dir() + .expect("Failed to get cwd during project discovery"), + ); + self.discover_handle = Some(handle.unwrap_or_else(|e| { + panic!("Failed to spawn project discovery command: {e}") + })); } } } |