Merge branch 'master' into file-changed-on-disk

2021-05-12 16:20:03 -07:00
parent 048bbc9da0 36163f7b80
commit 4910bc50c6
14 changed files with 3718 additions and 4119 deletions
@@ -1180,6 +1180,7 @@ dependencies = [
 "etagere",
 "font-kit",
 "foreign-types",
+ "gpui_macros",
 "log",
 "metal",
 "num_cpus",
@@ -1205,6 +1206,14 @@ dependencies = [
 "usvg",
 ]

+[[package]]
+name = "gpui_macros"
+version = "0.1.0"
+dependencies = [
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.9.1"