diff options
| author | MoskalykA <100430077+MoskalykA@users.noreply.github.com> | 2024-10-07 18:44:24 +0200 |
|---|---|---|
| committer | Laurențiu Nicola <lnicola@dend.ro> | 2024-10-26 09:39:04 +0300 |
| commit | f719ee7fc2d56deeef4794a58f5db7df345fe918 (patch) | |
| tree | f7b30c732da2cd8f464a26f2049c9bb6518dbd05 /src/tools/rust-analyzer | |
| parent | 510090f77453980255db60725532ab5ec111ce0b (diff) | |
| download | rust-f719ee7fc2d56deeef4794a58f5db7df345fe918.tar.gz rust-f719ee7fc2d56deeef4794a58f5db7df345fe918.zip | |
Use method syntax
Diffstat (limited to 'src/tools/rust-analyzer')
| -rw-r--r-- | src/tools/rust-analyzer/crates/hir-ty/src/consteval.rs | 2 | ||||
| -rw-r--r-- | src/tools/rust-analyzer/crates/ide-completion/src/completions/mod_.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/rust-analyzer/crates/hir-ty/src/consteval.rs b/src/tools/rust-analyzer/crates/hir-ty/src/consteval.rs index ba0952f708f..091cfcd4654 100644 --- a/src/tools/rust-analyzer/crates/hir-ty/src/consteval.rs +++ b/src/tools/rust-analyzer/crates/hir-ty/src/consteval.rs @@ -287,7 +287,7 @@ pub(crate) fn const_eval_discriminant_variant( } let repr = db.enum_data(loc.parent).repr; - let is_signed = Option::is_none_or(repr.and_then(|repr| repr.int), |int| int.is_signed()); + let is_signed = repr.and_then(|repr| repr.int).is_none_or(|int| int.is_signed()); let mir_body = db.monomorphized_mir_body( def, diff --git a/src/tools/rust-analyzer/crates/ide-completion/src/completions/mod_.rs b/src/tools/rust-analyzer/crates/ide-completion/src/completions/mod_.rs index c0fb981749a..f12f011a6bd 100644 --- a/src/tools/rust-analyzer/crates/ide-completion/src/completions/mod_.rs +++ b/src/tools/rust-analyzer/crates/ide-completion/src/completions/mod_.rs @@ -65,7 +65,7 @@ pub(crate) fn complete_mod( .iter() .filter(|&submodule_candidate_file| submodule_candidate_file != module_definition_file) .filter(|&submodule_candidate_file| { - Option::is_none_or(module_declaration_file, |it| it != submodule_candidate_file) + module_declaration_file.is_none_or(|it| it != submodule_candidate_file) }) .filter_map(|submodule_file| { let submodule_path = source_root.path_for_file(&submodule_file)?; |