diff --git a/Cargo.lock b/Cargo.lock index 0c951dd44179a5cd156e814849ed2dd8c475fc5f..2787475e834a5fcda6a0b29dd0d3072602f59efc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2334,9 +2334,8 @@ dependencies = [ [[package]] name = "ctor" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" +version = "0.1.20" +source = "git+https://github.com/zed-industries/rust-ctor?rev=7f824cf6a7943885a649b579f33f9ac53f0d1db6#7f824cf6a7943885a649b579f33f9ac53f0d1db6" dependencies = [ "quote", "syn 1.0.109", diff --git a/Cargo.toml b/Cargo.toml index f2ad2949fee68fc8465b3495447a712b24dd3c4a..5f4bebfe49371fd66636640eb4c24ee3e422c7b8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -117,7 +117,10 @@ resolver = "2" [workspace.dependencies] anyhow = { version = "1.0.57" } async-trait = { version = "0.1" } -ctor = { version = "0.1" } +# TODO: Switch back to the published version of `ctor` once: +# 1. A new version of `ctor` is published with this change: https://github.com/mmastrac/rust-ctor/pull/295 +# 2. We've confirmed it's fine to update to the latest version of `ctor` (we're currently on v0.1.20). +ctor = { git = "https://github.com/zed-industries/rust-ctor", rev = "7f824cf6a7943885a649b579f33f9ac53f0d1db6" } derive_more = { version = "0.99.17" } env_logger = { version = "0.9" } futures = { version = "0.3" } diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml index bee8d0bc429b1b9a70626ef811ae6ef8926adedf..941898cdc3e232b63ace2f08454a8db61ad93417 100644 --- a/crates/zed/Cargo.toml +++ b/crates/zed/Cargo.toml @@ -84,7 +84,7 @@ async-recursion = "0.3" async-trait.workspace = true backtrace = "0.3" chrono = "0.4" -ctor = "0.1.20" +ctor.workspace = true env_logger.workspace = true futures.workspace = true ignore = "0.4" diff --git a/crates/zed2/Cargo.toml b/crates/zed2/Cargo.toml index 2c93de734e9864973763d48ab46930c37d1628b0..48c6dc22691e323d8a42a750a969b361296197d8 100644 --- a/crates/zed2/Cargo.toml +++ b/crates/zed2/Cargo.toml @@ -80,7 +80,7 @@ async-recursion = "0.3" async-trait.workspace = true backtrace = "0.3" chrono = "0.4" -ctor = "0.1.20" +ctor.workspace = true env_logger.workspace = true futures.workspace = true ignore = "0.4"