From 4547da0b7b29e7ffe095810b66df8dd9e674d89f Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte+git@posteo.de>
Date: Sat, 7 Sep 2024 10:43:12 +0200
Subject: [PATCH] Fix CI by changing where deprecations are added and allowed

---
 .../ruma-federation-api/src/membership/create_join_event.rs   | 1 -
 .../src/membership/create_join_event/v1.rs                    | 4 ++++
 .../ruma-federation-api/src/membership/create_leave_event.rs  | 1 -
 .../src/membership/create_leave_event/v1.rs                   | 4 ++++
 crates/ruma-macros/src/api/request.rs                         | 1 -
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/crates/ruma-federation-api/src/membership/create_join_event.rs b/crates/ruma-federation-api/src/membership/create_join_event.rs
index 78406535..1a1e9639 100644
--- a/crates/ruma-federation-api/src/membership/create_join_event.rs
+++ b/crates/ruma-federation-api/src/membership/create_join_event.rs
@@ -2,6 +2,5 @@
 //!
 //! Send a join event to a resident server.
 
-#[deprecated = "Since Matrix Server-Server API r0.1.4. Use the v2 endpoint instead."]
 pub mod v1;
 pub mod v2;
diff --git a/crates/ruma-federation-api/src/membership/create_join_event/v1.rs b/crates/ruma-federation-api/src/membership/create_join_event/v1.rs
index f21e9212..976aa24b 100644
--- a/crates/ruma-federation-api/src/membership/create_join_event/v1.rs
+++ b/crates/ruma-federation-api/src/membership/create_join_event/v1.rs
@@ -21,6 +21,7 @@ const METADATA: Metadata = metadata! {
 
 /// Request type for the `create_join_event` endpoint.
 #[request]
+#[deprecated = "Since Matrix Server-Server API r0.1.4. Use the v2 endpoint instead."]
 pub struct Request {
     /// The room ID that is about to be joined.
     ///
@@ -39,6 +40,7 @@ pub struct Request {
 
 /// Response type for the `create_join_event` endpoint.
 #[response]
+#[deprecated = "Since Matrix Server-Server API r0.1.4. Use the v2 endpoint instead."]
 pub struct Response {
     /// Full state and auth chain of the room prior to the join event.
     #[ruma_api(body)]
@@ -46,6 +48,7 @@ pub struct Response {
     pub room_state: RoomState,
 }
 
+#[allow(deprecated)]
 impl Request {
     /// Creates a new `Request` from the given room ID, event ID and PDU.
     pub fn new(room_id: OwnedRoomId, event_id: OwnedEventId, pdu: Box<RawJsonValue>) -> Self {
@@ -53,6 +56,7 @@ impl Request {
     }
 }
 
+#[allow(deprecated)]
 impl Response {
     /// Creates a new `Response` with the given room state.
     pub fn new(room_state: RoomState) -> Self {
diff --git a/crates/ruma-federation-api/src/membership/create_leave_event.rs b/crates/ruma-federation-api/src/membership/create_leave_event.rs
index a502007e..4f840b44 100644
--- a/crates/ruma-federation-api/src/membership/create_leave_event.rs
+++ b/crates/ruma-federation-api/src/membership/create_leave_event.rs
@@ -2,6 +2,5 @@
 //!
 //! Submit a signed leave event to the receiving server for it to accept it into the room's graph.
 
-#[deprecated = "Since Matrix Server-Server API r0.1.4. Use the v2 endpoint instead."]
 pub mod v1;
 pub mod v2;
diff --git a/crates/ruma-federation-api/src/membership/create_leave_event/v1.rs b/crates/ruma-federation-api/src/membership/create_leave_event/v1.rs
index 239a982d..6fb65917 100644
--- a/crates/ruma-federation-api/src/membership/create_leave_event/v1.rs
+++ b/crates/ruma-federation-api/src/membership/create_leave_event/v1.rs
@@ -21,6 +21,7 @@ const METADATA: Metadata = metadata! {
 
 /// Request type for the `create_leave_event` endpoint.
 #[request]
+#[deprecated = "Since Matrix Server-Server API r0.1.4. Use the v2 endpoint instead."]
 pub struct Request {
     /// The room ID that is about to be left.
     ///
@@ -40,6 +41,7 @@ pub struct Request {
 /// Response type for the `create_leave_event` endpoint.
 #[response]
 #[derive(Default)]
+#[deprecated = "Since Matrix Server-Server API r0.1.4. Use the v2 endpoint instead."]
 pub struct Response {
     /// An empty object.
     ///
@@ -49,6 +51,7 @@ pub struct Response {
     pub empty: Empty,
 }
 
+#[allow(deprecated)]
 impl Request {
     /// Creates a new `Request` from the given room ID, event ID and PDU.
     pub fn new(room_id: OwnedRoomId, event_id: OwnedEventId, pdu: Box<RawJsonValue>) -> Self {
@@ -56,6 +59,7 @@ impl Request {
     }
 }
 
+#[allow(deprecated)]
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
diff --git a/crates/ruma-macros/src/api/request.rs b/crates/ruma-macros/src/api/request.rs
index 449e5698..4081101a 100644
--- a/crates/ruma-macros/src/api/request.rs
+++ b/crates/ruma-macros/src/api/request.rs
@@ -272,7 +272,6 @@ impl Request {
         let path_fields = self.path_fields().map(|f| f.ident.as_ref().unwrap().to_string());
         let mut tests = quote! {
             #[::std::prelude::v1::test]
-            #[allow(deprecated)]
             fn path_parameters() {
                 let path_params = super::METADATA._path_parameters();
                 let request_path_fields: &[&::std::primitive::str] = &[#(#path_fields),*];