From 3d3e9130a882ff4f6604d7df28e23585e77c89a9 Mon Sep 17 00:00:00 2001 From: Be Date: Wed, 22 Oct 2025 02:37:20 -0500 Subject: [PATCH] collab: Pin sea-orm-macro crate version together with sea-orm (#40846) Currently running `cargo update` on Zed will break the collab crate because the versions of sea-orm and sea-orm-macros will not match. This results in a bunch of noisy warnings from rust-analyzer. Release Notes: - N/A --- Cargo.lock | 1 + Cargo.toml | 1 + crates/collab/Cargo.toml | 2 ++ 3 files changed, 4 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index bb5950741bd4dd857144541d0573d760e5564312..27848216c6931b8db41500a1d835d997dafd4cbd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3379,6 +3379,7 @@ dependencies = [ "rpc", "scrypt", "sea-orm", + "sea-orm-macros", "semantic_version", "semver", "serde", diff --git a/Cargo.toml b/Cargo.toml index 81e30b308af112457a2ce0ca3b479fa6f57707ba..bd0083d122018c6769ca161c31e0a9b3ef4ec898 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -901,4 +901,5 @@ ignored = [ "serde", "component", "documented", + "sea-orm-macros", ] diff --git a/crates/collab/Cargo.toml b/crates/collab/Cargo.toml index d3ded583d6a8147f40ddc23f65114b666727a8d3..52dbe46107501325e305a7e8e6e7bd9bb483affb 100644 --- a/crates/collab/Cargo.toml +++ b/crates/collab/Cargo.toml @@ -47,7 +47,9 @@ reqwest = { version = "0.11", features = ["json"] } reqwest_client.workspace = true rpc.workspace = true scrypt = "0.11" +# sea-orm and sea-orm-macros versions must match exactly. sea-orm = { version = "=1.1.10", features = ["sqlx-postgres", "postgres-array", "runtime-tokio-rustls", "with-uuid"] } +sea-orm-macros = "=1.1.10" semantic_version.workspace = true semver.workspace = true serde.workspace = true