catchup with main

2023-07-26 09:50:38 -04:00 · 2023-07-26 09:50:38 -04:00 · 0ac919f6e0
commit 0ac919f6e0
parent ca6f7d8a80 39f02c2b72
112 changed files with 4590 additions and 1029 deletions
--- a/crates/search/Cargo.toml
+++ b/crates/search/Cargo.toml
@ -9,6 +9,7 @@ path = "src/search.rs"
 doctest = false

 [dependencies]
+bitflags = "1"
 collections = { path = "../collections" }
 editor = { path = "../editor" }
 gpui = { path = "../gpui" }