Merge remote-tracking branch 'origin/main' into fewer-context-traits

crates/workspace/Cargo.toml

@@ -35,20 +35,19 @@ settings = { path = "../settings" }
 terminal = { path = "../terminal" }
 theme = { path = "../theme" }
 util = { path = "../util" }
+
 async-recursion = "1.0.0"
 bincode = "1.2.1"
-anyhow = "1.0.38"
-futures = "0.3"
-lazy_static = "1.4"
-env_logger = "0.9.1"
-log = { version = "0.4.16", features = ["kv_unstable_serde"] }
-parking_lot = "0.11.1"
-postage = { workspace = true }
-serde = { workspace = true }
-serde_derive = { workspace = true }
-serde_json = { workspace = true }
-smallvec = { workspace = true }
-indoc = "1.0.4"
+anyhow.workspace = true
+futures.workspace = true
+lazy_static.workspace = true
+log.workspace = true
+parking_lot.workspace = true
+postage.workspace = true
+serde.workspace = true
+serde_derive.workspace = true
+serde_json.workspace = true
+smallvec.workspace = true
 uuid = { version = "1.1.2", features = ["v4"] }
 
 [dev-dependencies]
@@ -59,3 +58,6 @@ project = { path = "../project", features = ["test-support"] }
 settings = { path = "../settings", features = ["test-support"] }
 fs = { path = "../fs", features = ["test-support"] }
 db = { path = "../db", features = ["test-support"] }
+
+indoc = "1.0.4"
+env_logger.workspace = true

crates/workspace/src/workspace.rs

@@ -2784,9 +2784,7 @@ fn notify_if_database_failed(workspace: &ViewHandle<Workspace>, cx: &mut AsyncAp
             workspace.show_notification_once(0, cx, |cx| {
                 cx.add_view(|_| {
                     MessageNotification::new(
-                        indoc::indoc! {"
-                            Failed to load any database file :(
-                        "},
+                        "Failed to load any database file.",
                         OsOpen::new("https://github.com/zed-industries/community/issues/new?assignees=&labels=defect%2Ctriage&template=2_bug_report.yml".to_string()),
                         "Click to let us know about this error"
                     )
@@ -2800,11 +2798,7 @@ fn notify_if_database_failed(workspace: &ViewHandle<Workspace>, cx: &mut AsyncAp
                         let backup_path = backup_path.to_string_lossy();
                         MessageNotification::new(
                             format!(
-                                indoc::indoc! {"
-                                Database file was corrupted :(
-                                Old database backed up to:
-                                {}
-                                "},
+                                "Database file was corrupted. Old database backed up to {}",
                                 backup_path
                             ),
                             OsOpen::new(backup_path.to_string()),