catchup with main

2023-08-23 22:31:39 +02:00 · 2023-08-23 22:31:39 +02:00 · b72c4c576b
commit b72c4c576b
parent e42b9e910e 6c45be2dc4
133 changed files with 13374 additions and 959 deletions
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@ -482,7 +482,7 @@ impl Item for ProjectSearchView {
            .update(cx, |editor, cx| editor.deactivated(cx));
    }

-    fn tab_content<T: View>(
+    fn tab_content<T: 'static>(
        &self,
        _detail: Option<usize>,
        tab_theme: &theme::Tab,