mirror of
https://github.com/zed-industries/zed.git
synced 2025-01-15 06:40:17 +00:00
2980f0508c
This PR is a follow-up to #7084, where I noted that I wasn't satisfied with using `SharedUri` to represent both URIs and paths on the local filesystem: > I'm still not entirely happy with this naming, as the file paths that we can store in here are not _really_ URIs, as they are lacking a protocol. > > I want to explore changing `SharedUri` / `SharedUrl` back to alway storing a URL and treat local filepaths differently, as it seems we're conflating two different concerns under the same umbrella, at the moment. `SharedUri` has now been reverted to just containing a `SharedString` with a URI. `ImageSource` now has a new `File` variant that is used to load an image from a `PathBuf`. Release Notes: - N/A
25 lines
627 B
Rust
25 lines
627 B
Rust
use derive_more::{Deref, DerefMut};
|
|
|
|
use crate::SharedString;
|
|
|
|
/// A [`SharedString`] containing a URI.
|
|
#[derive(Deref, DerefMut, Default, PartialEq, Eq, Hash, Clone)]
|
|
pub struct SharedUri(SharedString);
|
|
|
|
impl std::fmt::Debug for SharedUri {
|
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
self.0.fmt(f)
|
|
}
|
|
}
|
|
|
|
impl std::fmt::Display for SharedUri {
|
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
write!(f, "{}", self.0.as_ref())
|
|
}
|
|
}
|
|
|
|
impl<T: Into<SharedString>> From<T> for SharedUri {
|
|
fn from(value: T) -> Self {
|
|
Self(value.into())
|
|
}
|
|
}
|