Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
test(calendar): make test targets pass clippy with every feature set (#8767)
gbirman5feed574e148
diff --git a/crates/calendar_events/src/domain/mutations/test/join.rs b/crates/calendar_events/src/domain/mutations/test/join.rsindex 8f428fe16c..5dd12a191c 100644--- a/crates/calendar_events/src/domain/mutations/test/join.rs+++ b/crates/calendar_events/src/domain/mutations/test/join.rs@@ -290,7 +290,7 @@ async fn only_someone_who_can_change_the_event_lists_its_requests() {.list_join_requests(SHARER, request.event_id).await.unwrap(),- [request.clone()]+ std::slice::from_ref(&request));for (mutation_target, case) in [diff --git a/crates/calendar_events/src/inbound/team_toolset/test.rs b/crates/calendar_events/src/inbound/team_toolset/test.rsindex 0bd43c5528..d63e47671e 100644--- a/crates/calendar_events/src/inbound/team_toolset/test.rs+++ b/crates/calendar_events/src/inbound/team_toolset/test.rs@@ -10,9 +10,12 @@ use crate::domain::team::{AvailabilityCalendar, TeamCalendarCursor, TeamCalendarPage, TeamCalendarSharing,};+/// The requester, range and member filter of one team calendar read.+type TeamCalendarRequest = (String, OccurrenceRange, Option<Vec<String>>);+#[derive(Default)]struct FakeService {- requests: Mutex<Vec<(String, OccurrenceRange, Option<Vec<String>>)>>,+ requests: Mutex<Vec<TeamCalendarRequest>>,fail: bool,}diff --git a/crates/calendar_events/src/outbound/pg/test.rs b/crates/calendar_events/src/outbound/pg/test.rsindex f3a8c0d99a..af71296e4a 100644--- a/crates/calendar_events/src/outbound/pg/test.rs+++ b/crates/calendar_events/src/outbound/pg/test.rs@@ -1112,8 +1112,7 @@ async fn expired_google_worker_cannot_resurrect_reconciled_provider_data(pool: Pupsert: google.clone(),}).await- .unwrap()- .event_id;+ .unwrap();sqlx::query!(r#"@@ -3656,8 +3655,7 @@ async fn removing_a_google_source_restores_the_surviving_calendar_copy(pool: PgP});repo.upsert_event(CalendarEventWrite::UserMutation(team_copy)).await- .unwrap()- .event_id;+ .unwrap();repo.remove_provider_source(account_id, primary_id, "[email protected]").await@@ -4353,8 +4351,7 @@ async fn conference_provider_round_trips_through_persistence(pool: PgPool) {upsert.event.conference_provider = Some(ConferenceProvider::GoogleMeet);repo.upsert_event(CalendarEventWrite::UserMutation(upsert)).await- .unwrap()- .event_id;+ .unwrap();let starts_at = Utc.with_ymd_and_hms(2026, 7, 24, 0, 0, 0).unwrap();let ends_at = starts_at + Duration::days(2);@@ -4774,14 +4771,14 @@ async fn mention_previews_resolve_through_the_shared_uid(pool: PgPool) {}async fn share_with_channel(pool: &PgPool, event_id: Uuid, channel_id: Uuid) {- sqlx::query(+ sqlx::query!(r#"INSERT INTO entity_access (entity_id, entity_type, source_id, source_type, access_level)VALUES ($1, 'calendar_event', $2::uuid::text, 'channel', 'view')"#,+ event_id,+ channel_id,)- .bind(event_id)- .bind(channel_id).execute(pool).await.unwrap();@@ -4789,20 +4786,20 @@ async fn share_with_channel(pool: &PgPool, event_id: Uuid, channel_id: Uuid) {async fn insert_channel(pool: &PgPool, owner_id: &str, members: &[&str]) -> Uuid {let channel_id = Uuid::now_v7();- sqlx::query(+ sqlx::query!("INSERT INTO comms_channels (id, channel_type, owner_id) VALUES ($1, 'private', $2)",+ channel_id,+ owner_id,)- .bind(channel_id)- .bind(owner_id).execute(pool).await.unwrap();for member in members {- sqlx::query(+ sqlx::query!("INSERT INTO comms_channel_participants (channel_id, user_id, role) VALUES ($1, $2, 'member')",+ channel_id,+ *member,)- .bind(channel_id)- .bind(*member).execute(pool).await.unwrap();@@ -4872,11 +4869,11 @@ async fn mention_previews_fall_back_to_a_channel_shared_projection(pool: PgPool)&[author_id, attendee_id, member_id, former_id],).await;- sqlx::query(+ sqlx::query!("UPDATE comms_channel_participants SET left_at = now() WHERE channel_id = $1 AND user_id = $2",+ channel_id,+ former_id,)- .bind(channel_id)- .bind(former_id).execute(&pool).await.unwrap();@@ -4944,11 +4941,13 @@ async fn mention_previews_fall_back_to_a_channel_shared_projection(pool: PgPool)}// A cancelled event no longer previews for anyone.- sqlx::query("UPDATE calendar_events SET status = 'cancelled' WHERE id = $1")- .bind(shared_event_id)- .execute(&pool)- .await- .unwrap();+ sqlx::query!(+ "UPDATE calendar_events SET status = 'cancelled' WHERE id = $1",+ shared_event_id,+ )+ .execute(&pool)+ .await+ .unwrap();let previews = repo.mention_previews(member_id, vec![request(shared_event_id)], now).await@@ -7271,11 +7270,13 @@ mod source_access;mod replacement;async fn link_email(pool: &PgPool, link_id: Uuid) -> String {- sqlx::query_scalar("SELECT email_address FROM email_links WHERE id = $1")- .bind(link_id)- .fetch_one(pool)- .await- .unwrap()+ sqlx::query_scalar!(+ r#"SELECT email_address::text AS "email_address!" FROM email_links WHERE id = $1"#,+ link_id,+ )+ .fetch_one(pool)+ .await+ .unwrap()}fn attendee(email: &str, is_organizer: bool) -> CalendarAttendee {diff --git a/crates/calendar_events/src/outbound/pg/test/export.rs b/crates/calendar_events/src/outbound/pg/test/export.rsindex 1969017137..7544a5cc98 100644--- a/crates/calendar_events/src/outbound/pg/test/export.rs+++ b/crates/calendar_events/src/outbound/pg/test/export.rs@@ -55,11 +55,11 @@ async fn event_export_resolves_own_copies_before_channel_shares(pool: PgPool) {&[author_id, attendee_id, member_id, former_id],).await;- sqlx::query(+ sqlx::query!("UPDATE comms_channel_participants SET left_at = now() WHERE channel_id = $1 AND user_id = $2",+ channel_id,+ former_id,)- .bind(channel_id)- .bind(former_id).execute(&pool).await.unwrap();@@ -114,11 +114,13 @@ async fn event_export_resolves_own_copies_before_channel_shares(pool: PgPool) {);}- sqlx::query("UPDATE calendar_events SET status = 'cancelled' WHERE id = $1")- .bind(shared_event_id)- .execute(&pool)- .await- .unwrap();+ sqlx::query!(+ "UPDATE calendar_events SET status = 'cancelled' WHERE id = $1",+ shared_event_id,+ )+ .execute(&pool)+ .await+ .unwrap();assert_eq!(repo.event_export(member_id, shared_event_id).await.unwrap(),Nonediff --git a/crates/calendar_events/src/outbound/pg/test/join_requests.rs b/crates/calendar_events/src/outbound/pg/test/join_requests.rsindex f7c3664f61..94408ad44f 100644--- a/crates/calendar_events/src/outbound/pg/test/join_requests.rs+++ b/crates/calendar_events/src/outbound/pg/test/join_requests.rs@@ -36,7 +36,7 @@ async fn join_requests_open_once_and_resolve_once(pool: PgPool) {assert_eq!(again, first);assert_eq!(repo.list_pending_join_requests(event_id).await.unwrap(),- [first.clone()]+ std::slice::from_ref(&first));let declined = repo@@ -104,11 +104,13 @@ async fn join_requests_open_once_and_resolve_once(pool: PgPool) {// An acceptance whose invitation was written while a decline landed// still records the grant the guest list now holds.- sqlx::query("UPDATE calendar_event_join_requests SET status = 'declined' WHERE id = $1")- .bind(second.id)- .execute(&pool)- .await- .unwrap();+ sqlx::query!(+ "UPDATE calendar_event_join_requests SET status = 'declined' WHERE id = $1",+ second.id,+ )+ .execute(&pool)+ .await+ .unwrap();let granted = repo.resolve_join_request(second.id, CalendarJoinRequestStatus::Accepted).await@@ -117,8 +119,7 @@ async fn join_requests_open_once_and_resolve_once(pool: PgPool) {assert_eq!(granted.status, CalendarJoinRequestStatus::Accepted);// Requests go with the shared event.- sqlx::query("DELETE FROM calendar_events WHERE id = $1")- .bind(event_id)+ sqlx::query!("DELETE FROM calendar_events WHERE id = $1", event_id).execute(&pool).await.unwrap();