Rebase - Got Zed compiling and fixed a build error due to conflicting dependencies that cargo didn't catch :(

Co-Authored-By: kay@zed.dev
3451a3c7feMikayla Maki committed on 12/4/2022, 12:04:10 AMparentb9cbd40
22 files changedLine totals unavailable