about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-06-20 21:22:59 +0000
committerbors <bors@rust-lang.org>2023-06-20 21:22:59 +0000
commit2d64a0aa6eddc8b72f4a7c7ac517ca21ef21c87a (patch)
treed1e83eedf8a370a8b1f553c4f57f14a038df9ac6
parent7ebe7ac9080a5c071074d7f858b86ed08228bc70 (diff)
parent10aba11b29a33c39e4767534db736ff942ecd8a8 (diff)
downloadrust-2d64a0aa6eddc8b72f4a7c7ac517ca21ef21c87a.tar.gz
rust-2d64a0aa6eddc8b72f4a7c7ac517ca21ef21c87a.zip
Auto merge of #15097 - HKalbasi:abs-path-display, r=matklad
Fix VfsPath Display and Debug impls

fix https://github.com/rust-lang/rust-analyzer/pull/15087#discussion_r1234544484
r? `@matklad`
-rw-r--r--crates/vfs/src/vfs_path.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/vfs/src/vfs_path.rs b/crates/vfs/src/vfs_path.rs
index f9248feb34a..f88881488a6 100644
--- a/crates/vfs/src/vfs_path.rs
+++ b/crates/vfs/src/vfs_path.rs
@@ -292,7 +292,7 @@ impl From<AbsPathBuf> for VfsPath {
 impl fmt::Display for VfsPath {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match &self.0 {
-            VfsPathRepr::PathBuf(it) => fmt::Debug::fmt(&it, f),
+            VfsPathRepr::PathBuf(it) => fmt::Display::fmt(&it, f),
             VfsPathRepr::VirtualPath(VirtualPath(it)) => fmt::Display::fmt(it, f),
         }
     }
@@ -307,7 +307,7 @@ impl fmt::Debug for VfsPath {
 impl fmt::Debug for VfsPathRepr {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match &self {
-            VfsPathRepr::PathBuf(it) => fmt::Display::fmt(&it, f),
+            VfsPathRepr::PathBuf(it) => fmt::Debug::fmt(&it, f),
             VfsPathRepr::VirtualPath(VirtualPath(it)) => fmt::Debug::fmt(&it, f),
         }
     }