Merge branch 'main' into collab-panel

2023-08-12 12:44:22 -07:00 · 2023-08-12 12:44:22 -07:00 · a90c0e0326
commit a90c0e0326
parent 9b5551a079 5ce7ccac32
30 changed files with 410 additions and 100 deletions
--- a/crates/terminal_view/src/terminal_panel.rs
+++ b/crates/terminal_view/src/terminal_panel.rs
@ -72,10 +72,7 @@ impl TerminalPanel {
                        0,
                        "icons/plus_12.svg",
                        false,
-                        Some((
-                            "New Terminal".into(),
-                            Some(Box::new(workspace::NewTerminal)),
-                        )),
+                        Some(("New Terminal", Some(Box::new(workspace::NewTerminal)))),
                        cx,
                        move |_, cx| {
                            let this = this.clone();