Improve consistent around using displaydoc::Display vs strum_macros::Display.

Author: jsmnbom

crates/buttplug_core/src/connector/transport/mod.rs

@@ -12,7 +12,7 @@ use crate::connector::{
   ButtplugConnectorResultFuture,
   ButtplugSerializedMessage,
 };
-use displaydoc::Display;
+use strum_macros::Display;
 use futures::future::BoxFuture;
 use thiserror::Error;
 use tokio::sync::mpsc::{Receiver, Sender};

crates/buttplug_core/src/errors.rs

@@ -15,6 +15,7 @@ use super::message::{
   OutputType,
   serializer::ButtplugSerializerError,
 };
+use displaydoc::Display;
 use futures::future::BoxFuture;
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
@@ -51,7 +52,7 @@ impl_error_to_future!(
 /// a remote network connection cannot be established), see
 /// [crate::connector::ButtplugConnectorError].
 
-#[derive(Debug, Error, Display, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Display, Error, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub enum ButtplugHandshakeError {
   /// Expected either a ServerInfo or Error message, received {0}
   UnexpectedHandshakeMessageReceived(String),
@@ -130,7 +131,7 @@ pub enum ButtplugDeviceError {
   DeviceCommunicationError(String),
   /// Device feature only has {0} steps for control, but {1} steps specified.
   DeviceStepRangeError(i32, i32),
-  /// Device got {} output command but has no viable outputs
+  /// Device got {0} output command but has no viable outputs
   DeviceNoOutputError(OutputType),
   /// Device got {0} input command but has no viable inputs
   DeviceNoInputError(InputType),

crates/buttplug_core/src/lib.rs

@@ -12,9 +12,6 @@ pub mod errors;
 pub mod message;
 pub mod util;
 
-#[macro_use]
-extern crate strum_macros;
-
 use errors::ButtplugError;
 use futures::future::{self, BoxFuture, FutureExt};
 

crates/buttplug_core/src/message/device_feature.rs

@@ -10,6 +10,7 @@ use derive_builder::Builder;
 use getset::{CopyGetters, Getters, MutGetters, Setters};
 use serde::{Deserialize, Serialize};
 use std::hash::Hash;
+use strum_macros::{Display, EnumIter, EnumString};
 
 #[derive(
   Debug, Display, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, Hash, EnumIter, EnumString,

crates/buttplug_core/src/message/mod.rs

@@ -28,6 +28,7 @@ use crate::errors::ButtplugMessageError;
 use enum_dispatch::enum_dispatch;
 use serde_repr::{Deserialize_repr, Serialize_repr};
 use std::convert::TryFrom;
+use strum_macros::Display;
 
 use super::errors::ButtplugError;
 

crates/buttplug_core/src/message/v4/input_cmd.rs

@@ -17,6 +17,7 @@ use crate::message::{
 use getset::CopyGetters;
 use serde::{Deserialize, Deserializer, Serialize, Serializer, de::{SeqAccess, Visitor}, ser::SerializeSeq};
 use enumflags2::{BitFlags, bitflags};
+use strum_macros::Display;
 
 #[bitflags]
 #[repr(u8)]

crates/buttplug_core/src/message/v4/input_reading.rs

@@ -8,6 +8,7 @@
 use crate::message::{ButtplugDeviceMessage, ButtplugMessage, ButtplugMessageValidator, InputType};
 use getset::{CopyGetters, Getters};
 use serde::{Deserialize, Serialize};
+use strum_macros::Display;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, CopyGetters)]
 #[getset(get_copy = "pub")]

crates/buttplug_core/src/message/v4/output_cmd.rs

@@ -17,6 +17,7 @@ use crate::{
 };
 use getset::CopyGetters;
 use serde::{Deserialize, Serialize};
+use strum_macros::Display;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, CopyGetters)]
 #[getset(get_copy = "pub")]

crates/buttplug_core/src/message/v4/spec_enums.rs

@@ -22,6 +22,7 @@ use crate::message::{
 };
 use enum_dispatch::enum_dispatch;
 use serde::{Deserialize, Serialize};
+use strum_macros::Display;
 
 use super::{DeviceListV4, InputReadingV4};
 

crates/buttplug_server_device_config/src/lib.rs

@@ -159,30 +159,26 @@ pub use endpoint::*;
 use uuid::Uuid;
 
 use thiserror::Error;
+use displaydoc::Display;
 
-#[derive(Error, Debug)]
+#[derive(Error, Debug, Display)]
 pub enum ButtplugDeviceConfigError {
-  /// Conversion to client type not possible with requested property type
-  #[error("Conversion of {0} to client type not possible with requested property type")]
+  /// Conversion of {0} to client type not possible with requested property type
   InvalidOutputTypeConversion(String),
   /// User set range exceeds bounds of possible configuration range
-  #[error("User set range exceeds bounds of possible configuration range")]
   InvalidUserRange,
-  /// Base range required
-  #[error("Base range required for all feature outputs")]
+  /// Base range required for all feature outputs
   BaseRangeRequired,
-  /// Base ID not found, cannot match user device/feature to a base device/feature
-  #[error("Device definition with base id {0} not found")]
+  /// Device definition with base id {0} not found
   BaseIdNotFound(Uuid),
-  #[error("Feature vectors between base and user device definitions do not match")]
+  /// Feature vectors between base and user device definitions do not match
   UserFeatureMismatch,
-  #[error("Output value {0} not in range {1}")]
+  /// Output value {0} not in range {1}
   InvalidOutputValue(i32, String),
-  #[error("Output type {0} not available on device")]
+  /// Output type {0} not available on device
   InvalidOutput(OutputType),
-  #[error("Float value {0} is not 0 < x < 1")]
+  /// Float value {0} is not 0 < x < 1
   InvalidFloatConversion(f64),
   /// Feature or device is missing required base_id for user config conversion
-  #[error("Feature or device is missing required base_id for user config conversion")]
   MissingBaseId,
 }