Move all crates to a top-level crates folder

Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
2024-12-25 08:55:10 +03:00 · 2021-10-04 13:22:21 -06:00 · 2021-10-04 13:22:21 -06:00 · fdfed3d7db
commit fdfed3d7db
parent d768224182
282 changed files with 195588 additions and 16 deletions
--- a/Cargo.toml
+++ b/Cargo.toml
@ -1,20 +1,6 @@
 [workspace]
-members = [
-    "buffer",
-    "clock",
-    "fsevent",
-    "fuzzy",
-    "gpui",
-    "gpui_macros",
-    "rpc_client",
-    "server",
-    "sum_tree",
-    "util",
-    "worktree",
-    "zed",
-    "zrpc"
-]
-default-members = ["zed"]
+members = ["crates/*"]
+default-members = ["crates/zed"]

 [patch.crates-io]
 async-task = { git = "https://github.com/zed-industries/async-task", rev = "341b57d6de98cdfd7b418567b8de2022ca993a6e" }
--- a/crates/buffer/Cargo.toml
+++ b/crates/buffer/Cargo.toml
--- a/crates/buffer/src/anchor.rs
+++ b/crates/buffer/src/anchor.rs
--- a/crates/buffer/src/highlight_map.rs
+++ b/crates/buffer/src/highlight_map.rs
--- a/crates/buffer/src/language.rs
+++ b/crates/buffer/src/language.rs
--- a/crates/buffer/src/lib.rs
+++ b/crates/buffer/src/lib.rs
--- a/crates/buffer/src/operation_queue.rs
+++ b/crates/buffer/src/operation_queue.rs
--- a/crates/buffer/src/point.rs
+++ b/crates/buffer/src/point.rs
--- a/crates/buffer/src/random_char_iter.rs
+++ b/crates/buffer/src/random_char_iter.rs
--- a/crates/buffer/src/rope.rs
+++ b/crates/buffer/src/rope.rs
--- a/crates/buffer/src/selection.rs
+++ b/crates/buffer/src/selection.rs
--- a/crates/buffer/src/syntax_theme.rs
+++ b/crates/buffer/src/syntax_theme.rs
--- a/crates/clock/Cargo.toml
+++ b/crates/clock/Cargo.toml
--- a/crates/clock/src/lib.rs
+++ b/crates/clock/src/lib.rs
--- a/crates/fsevent/Cargo.toml
+++ b/crates/fsevent/Cargo.toml
--- a/crates/fsevent/examples/events.rs
+++ b/crates/fsevent/examples/events.rs
--- a/crates/fsevent/src/lib.rs
+++ b/crates/fsevent/src/lib.rs
--- a/crates/fuzzy/Cargo.toml
+++ b/crates/fuzzy/Cargo.toml
--- a/crates/fuzzy/src/char_bag.rs
+++ b/crates/fuzzy/src/char_bag.rs
--- a/crates/fuzzy/src/lib.rs
+++ b/crates/fuzzy/src/lib.rs
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
--- a/crates/gpui/build.rs
+++ b/crates/gpui/build.rs
--- a/crates/gpui/examples/text.rs
+++ b/crates/gpui/examples/text.rs
--- a/crates/gpui/grammars/context-predicate/.gitignore
+++ b/crates/gpui/grammars/context-predicate/.gitignore
--- a/crates/gpui/grammars/context-predicate/Cargo.toml
+++ b/crates/gpui/grammars/context-predicate/Cargo.toml
--- a/crates/gpui/grammars/context-predicate/binding.gyp
+++ b/crates/gpui/grammars/context-predicate/binding.gyp
--- a/crates/gpui/grammars/context-predicate/bindings/node/binding.cc
+++ b/crates/gpui/grammars/context-predicate/bindings/node/binding.cc
--- a/crates/gpui/grammars/context-predicate/bindings/node/index.js
+++ b/crates/gpui/grammars/context-predicate/bindings/node/index.js
--- a/crates/gpui/grammars/context-predicate/bindings/rust/build.rs
+++ b/crates/gpui/grammars/context-predicate/bindings/rust/build.rs
--- a/crates/gpui/grammars/context-predicate/bindings/rust/lib.rs
+++ b/crates/gpui/grammars/context-predicate/bindings/rust/lib.rs
--- a/crates/gpui/grammars/context-predicate/corpus/expressions.txt
+++ b/crates/gpui/grammars/context-predicate/corpus/expressions.txt
--- a/crates/gpui/grammars/context-predicate/grammar.js
+++ b/crates/gpui/grammars/context-predicate/grammar.js
--- a/crates/gpui/grammars/context-predicate/package-lock.json
+++ b/crates/gpui/grammars/context-predicate/package-lock.json
--- a/crates/gpui/grammars/context-predicate/package.json
+++ b/crates/gpui/grammars/context-predicate/package.json
--- a/crates/gpui/grammars/context-predicate/src/grammar.json
+++ b/crates/gpui/grammars/context-predicate/src/grammar.json
--- a/crates/gpui/grammars/context-predicate/src/node-types.json
+++ b/crates/gpui/grammars/context-predicate/src/node-types.json
--- a/crates/gpui/grammars/context-predicate/src/parser.c
+++ b/crates/gpui/grammars/context-predicate/src/parser.c
--- a/crates/gpui/grammars/context-predicate/src/tree_sitter/parser.h
+++ b/crates/gpui/grammars/context-predicate/src/tree_sitter/parser.h
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
--- a/crates/gpui/src/assets.rs
+++ b/crates/gpui/src/assets.rs
--- a/crates/gpui/src/clipboard.rs
+++ b/crates/gpui/src/clipboard.rs
--- a/crates/gpui/src/color.rs
+++ b/crates/gpui/src/color.rs
--- a/crates/gpui/src/elements.rs
+++ b/crates/gpui/src/elements.rs
--- a/crates/gpui/src/elements/align.rs
+++ b/crates/gpui/src/elements/align.rs
--- a/crates/gpui/src/elements/canvas.rs
+++ b/crates/gpui/src/elements/canvas.rs
--- a/crates/gpui/src/elements/constrained_box.rs
+++ b/crates/gpui/src/elements/constrained_box.rs
--- a/crates/gpui/src/elements/container.rs
+++ b/crates/gpui/src/elements/container.rs
--- a/crates/gpui/src/elements/empty.rs
+++ b/crates/gpui/src/elements/empty.rs
--- a/crates/gpui/src/elements/event_handler.rs
+++ b/crates/gpui/src/elements/event_handler.rs
--- a/crates/gpui/src/elements/flex.rs
+++ b/crates/gpui/src/elements/flex.rs
--- a/crates/gpui/src/elements/hook.rs
+++ b/crates/gpui/src/elements/hook.rs
--- a/crates/gpui/src/elements/image.rs
+++ b/crates/gpui/src/elements/image.rs
--- a/crates/gpui/src/elements/label.rs
+++ b/crates/gpui/src/elements/label.rs
--- a/crates/gpui/src/elements/list.rs
+++ b/crates/gpui/src/elements/list.rs
--- a/crates/gpui/src/elements/mouse_event_handler.rs
+++ b/crates/gpui/src/elements/mouse_event_handler.rs
--- a/crates/gpui/src/elements/overlay.rs
+++ b/crates/gpui/src/elements/overlay.rs
--- a/crates/gpui/src/elements/stack.rs
+++ b/crates/gpui/src/elements/stack.rs
--- a/crates/gpui/src/elements/svg.rs
+++ b/crates/gpui/src/elements/svg.rs
--- a/crates/gpui/src/elements/text.rs
+++ b/crates/gpui/src/elements/text.rs
--- a/crates/gpui/src/elements/uniform_list.rs
+++ b/crates/gpui/src/elements/uniform_list.rs
--- a/crates/gpui/src/executor.rs
+++ b/crates/gpui/src/executor.rs
--- a/crates/gpui/src/font_cache.rs
+++ b/crates/gpui/src/font_cache.rs
--- a/crates/gpui/src/fonts.rs
+++ b/crates/gpui/src/fonts.rs
--- a/crates/gpui/src/geometry.rs
+++ b/crates/gpui/src/geometry.rs
--- a/crates/gpui/src/image_data.rs
+++ b/crates/gpui/src/image_data.rs
--- a/crates/gpui/src/json.rs
+++ b/crates/gpui/src/json.rs
--- a/crates/gpui/src/keymap.rs
+++ b/crates/gpui/src/keymap.rs
--- a/crates/gpui/src/lib.rs
+++ b/crates/gpui/src/lib.rs
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
--- a/crates/gpui/src/platform/event.rs
+++ b/crates/gpui/src/platform/event.rs
--- a/crates/gpui/src/platform/mac.rs
+++ b/crates/gpui/src/platform/mac.rs
--- a/crates/gpui/src/platform/mac/atlas.rs
+++ b/crates/gpui/src/platform/mac/atlas.rs
--- a/crates/gpui/src/platform/mac/dispatch.h
+++ b/crates/gpui/src/platform/mac/dispatch.h
--- a/crates/gpui/src/platform/mac/dispatcher.rs
+++ b/crates/gpui/src/platform/mac/dispatcher.rs
--- a/crates/gpui/src/platform/mac/event.rs
+++ b/crates/gpui/src/platform/mac/event.rs
--- a/crates/gpui/src/platform/mac/fonts.rs
+++ b/crates/gpui/src/platform/mac/fonts.rs
--- a/crates/gpui/src/platform/mac/geometry.rs
+++ b/crates/gpui/src/platform/mac/geometry.rs
--- a/crates/gpui/src/platform/mac/image_cache.rs
+++ b/crates/gpui/src/platform/mac/image_cache.rs
--- a/crates/gpui/src/platform/mac/platform.rs
+++ b/crates/gpui/src/platform/mac/platform.rs
--- a/crates/gpui/src/platform/mac/renderer.rs
+++ b/crates/gpui/src/platform/mac/renderer.rs
--- a/crates/gpui/src/platform/mac/shaders/shaders.h
+++ b/crates/gpui/src/platform/mac/shaders/shaders.h
--- a/crates/gpui/src/platform/mac/shaders/shaders.metal
+++ b/crates/gpui/src/platform/mac/shaders/shaders.metal
--- a/crates/gpui/src/platform/mac/sprite_cache.rs
+++ b/crates/gpui/src/platform/mac/sprite_cache.rs
--- a/crates/gpui/src/platform/mac/window.rs
+++ b/crates/gpui/src/platform/mac/window.rs
--- a/crates/gpui/src/platform/test.rs
+++ b/crates/gpui/src/platform/test.rs
--- a/crates/gpui/src/presenter.rs
+++ b/crates/gpui/src/presenter.rs
--- a/crates/gpui/src/scene.rs
+++ b/crates/gpui/src/scene.rs
--- a/crates/gpui/src/test.rs
+++ b/crates/gpui/src/test.rs
--- a/crates/gpui/src/text_layout.rs
+++ b/crates/gpui/src/text_layout.rs
--- a/crates/gpui/src/util.rs
+++ b/crates/gpui/src/util.rs
--- a/crates/gpui/src/views.rs
+++ b/crates/gpui/src/views.rs
--- a/crates/gpui/src/views/select.rs
+++ b/crates/gpui/src/views/select.rs
--- a/crates/gpui_macros/Cargo.toml
+++ b/crates/gpui_macros/Cargo.toml
--- a/crates/gpui_macros/src/lib.rs
+++ b/crates/gpui_macros/src/lib.rs
--- a/crates/rpc_client/Cargo.toml
+++ b/crates/rpc_client/Cargo.toml
--- a/crates/rpc_client/src/lib.rs
+++ b/crates/rpc_client/src/lib.rs
--- a/crates/rpc_client/src/test.rs
+++ b/crates/rpc_client/src/test.rs
--- a/crates/server/.env.template.toml
+++ b/crates/server/.env.template.toml
--- a/crates/server/.env.toml
+++ b/crates/server/.env.toml
@ -0,0 +1,41 @@
+# Prod database: CAREFUL!
+# DATABASE_URL = "postgres://postgres:f71db7645055488d666f3c26392113104706af1f24d2cf15@zed-db.internal:5432/zed"
+
+HTTP_PORT = 8080
+
+DATABASE_URL = "postgres://postgres@localhost/zed"
+SESSION_SECRET = "6E1GS6IQNOLIBKWMEVWF1AFO4H78KNU8"
+
+# Available at https://github.com/organizations/zed-industries/settings/apps/zed-local-development
+GITHUB_APP_ID = 115633
+GITHUB_CLIENT_ID = "Iv1.768076c9becc75c4"
+GITHUB_CLIENT_SECRET = "3592ffff1ecda9773a3df7b0e75375bfbe7992fc"
+GITHUB_PRIVATE_KEY = """\
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAtt0O2t69ksn2zX5ucHpflNRoqdh342OOwrazLA6GS8Kp2hWM
+NwLzymm2s8k1e2F7sAVYNHJvUPZCvM/xYuVMNpx33fVr00Tni2ATNJKS2lvCEBC0
+nTUKxXQImF82IQadg41o+81gofR3zt2UM7iDRMPbmn/aZe7K8vvFEERawSfKEMv3
+RqAzqt0fBDYvwHonje0Y7/5IAO5GDMd9kDE3w034ckwtyFAJDjRGYN5kVoRlua+Q
+aIHoBkJ/jUAsS4kWqZt/r6hbrAcgok7Iv2RoapfgNTPeJKEe0pAagz1orqbrm9Qk
+WBeAToTXl4YTfQruMNVyN2/5azqLnS8Urg2jHQIDAQABAoIBAF9TVY8bVk/TIOl2
+4zOXV4RKRlVkFvtexukSPMzWtYOA8vJREUsMKvJ1sVx/o3WyF7xmzNhqX0UhWyD6
+dadMSTKe1o3Khm8YGGw7pUdesVdLRhsB2mWpZPgRyPlFiP4maK5PZU7+fUVwH5Sj
+RcLAiQ2r3CrqQ3unw/xu6wfT2kueBMJz6DBCx3y5wwEyrR7b+8ZGrjUy9BelzKti
+yIT3OLWhilwho8l03Dg72SCSskotVMcywtc7SMr5PCILL7QANdJDhEO8FP4BysHx
+6wlFwpfIPnNHN/RN1Dnnut5F64nPu//6vUs9DR9c34FzDp0SR2hJ98PLYn3uyD5b
+6oOcZrECgYEA3QXrezpLwkZN2wS6r6vmNyEKSIevjpQpuFEzGSapJRJbGiP5/C+l
+DfTmYud6Ld5YrL7xIQuf6SQWyO8WZkKA6D15VBdsFzM0pzhNGNGUgZYiTQ6rdh83
+5mL8l9IqzT5LD5RRXTj2CO7SB5iuyp8PrPyGCCVhILYJP+a4e4kHwEsCgYEA0803
+oF/QBhfKC3n/7xbRTeT4PcAHra+X84rY+KkyP1/qJXMRbCumpvTL6kZg7Jv2I3hG
+SaRK7mGhi0/omVn9aEgn4E7UKmE2ZhVbigTiqnPdYoH/hmrbQ5Z7SVaT/MNzGuKQ
+QZOmASgsZEjqSX7extXDzKOGD/AzMp3iWElUGTcCgYAOoT+vDnLJT0IEB1IcIrLA
+X22A04ppU6FXU/if55E2pPpmxo7bhIPWYqmFTnEl7BvOg20OlOhm1D612i2PY0OJ
+G9iWGl7LQlZv4ygnRmggE8H9e8UZsoNOuqqhmgW/RCpPw6+HDigq+zPn0NFxFApD
+lwuAKok9Uw9VrX30n2Nl9QKBgAG7c/ED15e1Khnd7ZHvBdc1QDKBF478GKoNQKkH
+Tk7d5bG0iWoVbyX0/MekDxfKiwwF6MSjOpWMhQJm0VlzwTDUlArVODj2qYLFqyS
+TahHOlBL7+MRjKmI2YlIA/3VO2PE5pkitADeaz6GuiPPvdKyfN93lukaddC8KdW/
+A8kRAoGBAJdU+sTC1zfP+tbgArzf4rU5qEknserAH+GE6C/Otn134WBEyqSgd2Jb
+JpJsl2l/X/8Wfwh+SJQbhvDoY4ApMKlgLFBAIY/p2UcpEdUL2juec/F6+qGnBncQ
+4I+MKiVfixBM9p66Afybiskh3a/RvXK+/6NNOVtVYaSd7aSIrq9W
+-----END RSA PRIVATE KEY-----
+"""
--- a/crates/server/Cargo.toml
+++ b/crates/server/Cargo.toml
--- a/Show More
+++ b/Show More