fix few compilation things after merging new upstream changes

Signed-off-by: June Clementine Strawberry <june@3.dog>

crates/ruma-appservice-api/src/thirdparty/get_protocol.rs

@@ -69,7 +69,7 @@ pub mod v1 {
     /// To create an instance of this type, first create a [`ProtocolInstanceInit`] and convert it
     /// via `AppserviceProtocolInstance::from` / `.into()`.
     #[derive(Clone, Debug, Deserialize, Serialize)]
-    #[cfg_attr(not(ruma_unstable_exhaustive_types), non_exhaustive)]
+    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     pub struct AppserviceProtocolInstance {
         /// A human-readable description for the protocol, such as the name.
         pub desc: String,

crates/ruma-common/src/media.rs

@@ -4,13 +4,13 @@
 
 use std::time::Duration;
 
-use ruma_macros::{OrdAsRefStr, PartialEqAsRefStr, PartialOrdAsRefStr};
+use ruma_macros::{OrdAsRefStr, PartialOrdAsRefStr};
 
 use crate::{serde::StringEnum, PrivOwnedStr};
 
 /// The desired resizing method for a thumbnail.
 #[doc = include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/src/doc/string_enum.md"))]
-#[derive(Clone, StringEnum, PartialEq, PartialEqAsRefStr, Eq, PartialOrdAsRefStr, OrdAsRefStr)]
+#[derive(Clone, StringEnum, PartialEq, Eq, PartialOrdAsRefStr, OrdAsRefStr)]
 #[ruma_enum(rename_all = "snake_case")]
 #[non_exhaustive]
 pub enum Method {

crates/ruma-common/src/serde.rs

@@ -82,7 +82,7 @@ pub fn or_empty<'de, D: Deserializer<'de>, T: for <'a> Deserialize<'a>>(
             Err(e) => {
                 #[derive(Deserialize)]
                 #[serde(deny_unknown_fields)]
-                struct Empty {};
+                struct Empty {}
                 if let Ok(Empty {}) = serde_json::from_str(json.get()) {
                     Ok(None)
                 } else {