From b15632bd453bd2f24e6589aa29b1d56e14aa4960 Mon Sep 17 00:00:00 2001 From: Petros Amoiridis Date: Wed, 29 Mar 2023 17:41:01 +0300 Subject: [PATCH] Remove convert_to_shortened_path from gpui platform --- crates/gpui/src/platform.rs | 1 - crates/gpui/src/platform/mac/platform.rs | 31 ------------------------ crates/gpui/src/platform/test.rs | 4 --- 3 files changed, 36 deletions(-) diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs index 482de941628b10a0957a35cd24e6d0441d6942a0..538b46ee7779a9f2bb3331230483fadfa20398f5 100644 --- a/crates/gpui/src/platform.rs +++ b/crates/gpui/src/platform.rs @@ -68,7 +68,6 @@ pub trait Platform: Send + Sync { fn write_to_clipboard(&self, item: ClipboardItem); fn read_from_clipboard(&self) -> Option; fn open_url(&self, url: &str); - fn convert_to_shortened_path(&self, path: &Path) -> PathBuf; fn write_credentials(&self, url: &str, username: &str, password: &[u8]) -> Result<()>; fn read_credentials(&self, url: &str) -> Result)>>; diff --git a/crates/gpui/src/platform/mac/platform.rs b/crates/gpui/src/platform/mac/platform.rs index d9ac7237cefe7e1cd71bbfba788f6b681421aa56..ab4fd873c641391f76afc793186442aed452dbd1 100644 --- a/crates/gpui/src/platform/mac/platform.rs +++ b/crates/gpui/src/platform/mac/platform.rs @@ -674,18 +674,6 @@ impl platform::Platform for MacPlatform { } } - fn convert_to_shortened_path(&self, path: &Path) -> PathBuf { - match path.strip_prefix(util::paths::HOME.as_path()) { - Ok(relative_path) => { - let mut shortened_path = PathBuf::new(); - shortened_path.push("~"); - shortened_path.push(relative_path); - shortened_path - } - Err(_) => path.to_path_buf(), - } - } - fn write_credentials(&self, url: &str, username: &str, password: &[u8]) -> Result<()> { let url = CFString::from(url); let username = CFString::from(username); @@ -1125,23 +1113,4 @@ mod tests { platform.pasteboard = unsafe { NSPasteboard::pasteboardWithUniqueName(nil) }; platform } - - #[test] - fn test_convert_to_shortened_path() { - let platform = build_platform(); - - let full_path: PathBuf = [ - util::paths::HOME.to_string_lossy().to_string(), - "a".to_string(), - "b".to_string(), - "c".to_string(), - ] - .iter() - .collect(); - - let shortened_path_actual = platform.convert_to_shortened_path(&full_path); - let shortened_path_expected = PathBuf::from("~/a/b/c"); - - assert_eq!(shortened_path_actual, shortened_path_expected); - } } diff --git a/crates/gpui/src/platform/test.rs b/crates/gpui/src/platform/test.rs index 6b1cdf5e054d3f2673fa05df3218e82a943fa7b7..a3532dd96e1298fedaa6ffea2214a026cc46e085 100644 --- a/crates/gpui/src/platform/test.rs +++ b/crates/gpui/src/platform/test.rs @@ -175,10 +175,6 @@ impl super::Platform for Platform { fn open_url(&self, _: &str) {} - fn convert_to_shortened_path(&self, _path: &Path) -> PathBuf { - PathBuf::new() - } - fn write_credentials(&self, _: &str, _: &str, _: &[u8]) -> Result<()> { Ok(()) }