Enable clippy::map_flatten (#8733)

This PR enables the
[`clippy::map_flatten`](https://rust-lang.github.io/rust-clippy/master/index.html#/map_flatten)
rule and fixes the outstanding violations.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2024-03-02 18:24:22 -05:00 committed by GitHub
parent 8bc35c33c5
commit eaf2fbb21b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 13 additions and 26 deletions

View file

@ -2775,7 +2775,7 @@ impl Project {
let project_settings =
ProjectSettings::get(Some((worktree_id.to_proto() as usize, Path::new(""))), cx);
let lsp = project_settings.lsp.get(&adapter.name.0);
let override_options = lsp.map(|s| s.initialization_options.clone()).flatten();
let override_options = lsp.and_then(|s| s.initialization_options.clone());
let server_id = pending_server.server_id;
let container_dir = pending_server.container_dir.clone();