Merge branch 'gpui2' into marshall/gpui2-playground

Cargo.lock

@@ -7796,7 +7796,6 @@ dependencies = [
  "anyhow",
  "chrono",
  "clap 4.4.4",
- "derive_more",
  "fs",
  "futures 0.3.28",
  "gpui2",
@@ -7818,18 +7817,13 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "backtrace-on-stack-overflow",
- "clap 4.4.4",
  "gpui3",
- "itertools 0.11.0",
  "log",
  "rust-embed",
  "serde",
  "settings",
  "simplelog",
- "smallvec",
- "strum",
  "theme",
- "ui2",
  "util",
 ]
 
@@ -9052,21 +9046,6 @@ dependencies = [
  "theme",
 ]
 
-[[package]]
-name = "ui2"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "chrono",
- "gpui3",
- "rand 0.8.5",
- "serde",
- "settings",
- "smallvec",
- "strum",
- "theme",
-]
-
 [[package]]
 name = "unicase"
 version = "2.7.0"