Merge branch 'main' into collab-renames

Cargo.lock

@@ -168,6 +168,15 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbf56136a5198c7b01a49e3afcbef6cf84597273d298f54432926024107b0109"
 
+[[package]]
+name = "assets"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "gpui",
+ "rust-embed",
+]
+
 [[package]]
 name = "async-attributes"
 version = "1.1.2"
@@ -1112,6 +1121,7 @@ dependencies = [
  "sha-1 0.9.6",
  "sqlx 0.5.5",
  "surf",
+ "theme",
  "tide",
  "tide-compress",
  "time 0.2.27",
@@ -4353,6 +4363,7 @@ dependencies = [
  "log",
  "postage",
  "project",
+ "serde",
  "serde_json",
  "settings",
  "theme",
@@ -4517,6 +4528,8 @@ name = "settings"
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "assets",
+ "collections",
  "gpui",
  "schemars",
  "serde",
@@ -5840,6 +5853,7 @@ checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
 name = "vim"
 version = "0.1.0"
 dependencies = [
+ "assets",
  "collections",
  "editor",
  "gpui",
@@ -5847,6 +5861,7 @@ dependencies = [
  "language",
  "log",
  "project",
+ "serde",
  "settings",
  "util",
  "workspace",
@@ -6114,6 +6129,7 @@ name = "zed"
 version = "0.25.0"
 dependencies = [
  "anyhow",
+ "assets",
  "async-compression",
  "async-recursion",
  "async-trait",