Restore changed public error structs for semver compat

Author: YaLTeR

src/common.rs

@@ -32,10 +32,9 @@ pub enum Error {
     WaylandCommunication(#[source] WaylandError),
 
     #[error(
-        "A required Wayland protocol (ext-data-control, or wlr-data-control version {version}) \
-         is not supported by the compositor"
+        "A required Wayland protocol ({name} version {version}) is not supported by the compositor"
     )]
-    MissingProtocol { version: u32 },
+    MissingProtocol { name: &'static str, version: u32 },
 }
 
 impl<S> Dispatch<WlSeat, (), S> for State
@@ -107,7 +106,12 @@ where
 
     let clipboard_manager = match ext_manager.or_else(wlr_manager) {
         Some(manager) => manager,
-        None => return Err(Error::MissingProtocol { version: wlr_v }),
+        None => {
+            return Err(Error::MissingProtocol {
+                name: "ext-data-control, or wlr-data-control",
+                version: wlr_v,
+            })
+        }
     };
 
     let registry = globals.registry();

src/copy.rs

@@ -188,10 +188,11 @@ pub enum Error {
     WaylandCommunication(#[source] DispatchError),
 
     #[error(
-        "A required Wayland protocol (ext-data-control, or wlr-data-control version {version}) \
-         is not supported by the compositor"
+        "A required Wayland protocol ({} version {}) is not supported by the compositor",
+        name,
+        version
     )]
-    MissingProtocol { version: u32 },
+    MissingProtocol { name: &'static str, version: u32 },
 
     #[error("The compositor does not support primary selection")]
     PrimarySelectionUnsupported,
@@ -220,7 +221,7 @@ impl From<common::Error> for Error {
             SocketOpenError(err) => Error::SocketOpenError(err),
             WaylandConnection(err) => Error::WaylandConnection(err),
             WaylandCommunication(err) => Error::WaylandCommunication(err.into()),
-            MissingProtocol { version } => Error::MissingProtocol { version },
+            MissingProtocol { name, version } => Error::MissingProtocol { name, version },
         }
     }
 }

src/paste.rs

@@ -108,10 +108,11 @@ pub enum Error {
     WaylandCommunication(#[source] DispatchError),
 
     #[error(
-        "A required Wayland protocol (ext-data-control, or wlr-data-control version {version}) \
-         is not supported by the compositor"
+        "A required Wayland protocol ({} version {}) is not supported by the compositor",
+        name,
+        version
     )]
-    MissingProtocol { version: u32 },
+    MissingProtocol { name: &'static str, version: u32 },
 
     #[error("The compositor does not support primary selection")]
     PrimarySelectionUnsupported,
@@ -131,7 +132,7 @@ impl From<common::Error> for Error {
             SocketOpenError(err) => Error::SocketOpenError(err),
             WaylandConnection(err) => Error::WaylandConnection(err),
             WaylandCommunication(err) => Error::WaylandCommunication(err.into()),
-            MissingProtocol { version } => Error::MissingProtocol { version },
+            MissingProtocol { name, version } => Error::MissingProtocol { name, version },
         }
     }
 }

src/tests/paste.rs

@@ -65,7 +65,13 @@ fn get_mime_types_no_data_control() {
 
     let result =
         get_mime_types_internal(ClipboardType::Regular, Seat::Unspecified, Some(socket_name));
-    assert!(matches!(result, Err(Error::MissingProtocol { version: 1 })));
+    assert!(matches!(
+        result,
+        Err(Error::MissingProtocol {
+            name: "ext-data-control, or wlr-data-control",
+            version: 1
+        })
+    ));
 }
 
 #[test]
@@ -88,7 +94,13 @@ fn get_mime_types_no_data_control_2() {
 
     let result =
         get_mime_types_internal(ClipboardType::Primary, Seat::Unspecified, Some(socket_name));
-    assert!(matches!(result, Err(Error::MissingProtocol { version: 2 })));
+    assert!(matches!(
+        result,
+        Err(Error::MissingProtocol {
+            name: "ext-data-control, or wlr-data-control",
+            version: 2
+        })
+    ));
 }
 
 #[test]