diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-06-17 17:22:32 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-06-17 17:22:32 +0100 |
| commit | ce926aebc4461e38535047958c0b6f72b7a0c0ea (patch) | |
| tree | 4b844e0681b459836bac22c34bee43e4dfa3dc5f /crates/vfs | |
| parent | 3ae0c5911ab50ee209179ee4329b0551abe6fc48 (diff) | |
| parent | 02d25ab60d2701ce71fe2dfaca36627ad902e229 (diff) | |
Merge #9315
9315: Nest all the or-patterns! r=Veykril a=Veykril
`cargo +nightly clippy --fix -Z unstable-options --allow-dirty -- -A clippy::all -D clippy::unnested_or_patterns`
Co-authored-by: Lukas Wirth <[email protected]>
Diffstat (limited to 'crates/vfs')
| -rw-r--r-- | crates/vfs/src/vfs_path.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/vfs/src/vfs_path.rs b/crates/vfs/src/vfs_path.rs index 2b3d7fd84..ef2d7657a 100644 --- a/crates/vfs/src/vfs_path.rs +++ b/crates/vfs/src/vfs_path.rs | |||
| @@ -389,7 +389,7 @@ impl VirtualPath { | |||
| 389 | 389 | ||
| 390 | match (file_stem, extension) { | 390 | match (file_stem, extension) { |
| 391 | (None, None) => None, | 391 | (None, None) => None, |
| 392 | (None, Some(_)) | (Some(""), Some(_)) => Some((file_name, None)), | 392 | (None | Some(""), Some(_)) => Some((file_name, None)), |
| 393 | (Some(file_stem), extension) => Some((file_stem, extension)), | 393 | (Some(file_stem), extension) => Some((file_stem, extension)), |
| 394 | } | 394 | } |
| 395 | } | 395 | } |