Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove unnecessary lifetimes from tab_description

Browse source
This commit is contained in:
Joseph Lyons 2023-04-18 14:15:56 -04:00
parent 9afd804062
commit 304eddbbe4
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/editor/src/items.rs
View file

@ -531,7 +531,7 @@ impl Item for Editor {
Some(file_path.into()) Some(file_path.into())
} }
fn tab_description<'a>(&'a self, detail: usize, cx: &'a AppContext) -> Option<Cow<'a, str>> { fn tab_description<'a>(&'a self, detail: usize, cx: &'a AppContext) -> Option<Cow<str>> {
match path_for_buffer(&self.buffer, detail, true, cx)? { match path_for_buffer(&self.buffer, detail, true, cx)? {
Cow::Borrowed(path) => Some(path.to_string_lossy()), Cow::Borrowed(path) => Some(path.to_string_lossy()),
Cow::Owned(path) => Some(path.to_string_lossy().to_string().into()), Cow::Owned(path) => Some(path.to_string_lossy().to_string().into()),

12
crates/workspace/src/item.rs
View file

@ -47,7 +47,7 @@ pub trait Item: View {
fn tab_tooltip_text(&self, _: &AppContext) -> Option<Cow<str>> { fn tab_tooltip_text(&self, _: &AppContext) -> Option<Cow<str>> {
None None
} }
fn tab_description<'a>(&'a self, _: usize, _: &'a AppContext) -> Option<Cow<'a, str>> { fn tab_description<'a>(&'a self, _: usize, _: &'a AppContext) -> Option<Cow<str>> {
None None
} }
fn tab_content(&self, detail: Option<usize>, style: &theme::Tab, cx: &AppContext) fn tab_content(&self, detail: Option<usize>, style: &theme::Tab, cx: &AppContext)
@ -165,8 +165,8 @@ pub trait ItemHandle: 'static + fmt::Debug {
cx: &mut AppContext, cx: &mut AppContext,
handler: Box<dyn Fn(ItemEvent, &mut AppContext)>, handler: Box<dyn Fn(ItemEvent, &mut AppContext)>,
) -> gpui::Subscription; ) -> gpui::Subscription;
fn tab_tooltip_text<'a>(&'a self, cx: &'a AppContext) -> Option<Cow<str>>; fn tab_tooltip_text<'a>(&self, cx: &'a AppContext) -> Option<Cow<'a, str>>;
fn tab_description<'a>(&self, detail: usize, cx: &'a AppContext) -> Option<Cow<'a, str>>; fn tab_description<'a>(&'a self, detail: usize, cx: &'a AppContext) -> Option<Cow<'a, str>>;
fn tab_content(&self, detail: Option<usize>, style: &theme::Tab, cx: &AppContext) fn tab_content(&self, detail: Option<usize>, style: &theme::Tab, cx: &AppContext)
-> ElementBox; -> ElementBox;
fn project_path(&self, cx: &AppContext) -> Option<ProjectPath>; fn project_path(&self, cx: &AppContext) -> Option<ProjectPath>;
@ -252,11 +252,11 @@ impl<T: Item> ItemHandle for ViewHandle<T> {
}) })
} }
fn tab_tooltip_text<'a>(&'a self, cx: &'a AppContext) -> Option<Cow<str>> { fn tab_tooltip_text<'a>(&self, cx: &'a AppContext) -> Option<Cow<'a, str>> {
self.read(cx).tab_tooltip_text(cx) self.read(cx).tab_tooltip_text(cx)
} }
fn tab_description<'a>(&self, detail: usize, cx: &'a AppContext) -> Option<Cow<'a, str>> { fn tab_description<'a>(&'a self, detail: usize, cx: &'a AppContext) -> Option<Cow<'a, str>> {
self.read(cx).tab_description(detail, cx) self.read(cx).tab_description(detail, cx)
} }
@ -913,7 +913,7 @@ pub(crate) mod test {
} }
impl Item for TestItem { impl Item for TestItem {
fn tab_description<'a>(&'a self, detail: usize, _: &'a AppContext) -> Option<Cow<'a, str>> { fn tab_description(&self, detail: usize, _: &AppContext) -> Option<Cow<str>> {
self.tab_descriptions.as_ref().and_then(|descriptions| { self.tab_descriptions.as_ref().and_then(|descriptions| {
let description = *descriptions.get(detail).or_else(|| descriptions.last())?; let description = *descriptions.get(detail).or_else(|| descriptions.last())?;
Some(description.into()) Some(description.into())