chore: update derive_more to 1.0

elkowar · Aug 8, 2024 · 69924ed · 69924ed
1 parent 0414663
commit 69924ed
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 25 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,7 +17,13 @@ chrono-tz = "0.9.0"
 clap = { version = "4.5.1", features = ["derive"] }
 clap_complete = "4.5.12"
 codespan-reporting = "0.11"
-derive_more = "0.99"
+derive_more = { version = "1", features = [
+    "as_ref",
+    "debug",
+    "display",
+    "from",
+    "from_str",
+] }
 extend = "1.2"
 futures = "0.3.30"
 grass = "0.13.4"

diff --git a/crates/eww/src/geometry.rs b/crates/eww/src/geometry.rs
@@ -1,7 +1,7 @@
-use derive_more::*;
+use derive_more::{Debug, *};
 
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Display)]
-#[display(fmt = ".x*.y:.width*.height")]
+#[display(".x*.y:.width*.height")]
 pub struct Rect {
     pub x: i32,
     pub y: i32,

diff --git a/crates/eww_shared_util/src/wrappers.rs b/crates/eww_shared_util/src/wrappers.rs
@@ -1,11 +1,11 @@
-use derive_more::*;
+use derive_more::{Debug, *};
 use ref_cast::RefCast;
 use serde::{Deserialize, Serialize};
 
 /// The name of a variable
 #[repr(transparent)]
-#[derive(Clone, Hash, PartialEq, Eq, Serialize, Deserialize, AsRef, From, FromStr, Display, DebugCustom, RefCast)]
-#[debug(fmt = "VarName({})", .0)]
+#[derive(Clone, Hash, PartialEq, Eq, Serialize, Deserialize, AsRef, From, FromStr, Display, Debug, RefCast)]
+#[debug("VarName({})", _0)]
 pub struct VarName(pub String);
 
 impl std::borrow::Borrow<str> for VarName {
@@ -34,8 +34,8 @@ impl From<AttrName> for VarName {
 
 /// The name of an attribute
 #[repr(transparent)]
-#[derive(Clone, Hash, PartialEq, Eq, Serialize, Deserialize, AsRef, From, FromStr, Display, DebugCustom, RefCast)]
-#[debug(fmt="AttrName({})", .0)]
+#[derive(Clone, Hash, PartialEq, Eq, Serialize, Deserialize, AsRef, From, FromStr, Display, Debug, RefCast)]
+#[debug("AttrName({})", _0)]
 pub struct AttrName(pub String);
 
 impl AttrName {

diff --git a/crates/yuck/src/value/coords.rs b/crates/yuck/src/value/coords.rs
@@ -1,4 +1,4 @@
-use derive_more::*;
+use derive_more::{Debug, *};
 use once_cell::sync::Lazy;
 use serde::{Deserialize, Serialize};
 use smart_default::SmartDefault;
@@ -14,13 +14,13 @@ pub enum Error {
     MalformedCoords,
 }
 
-#[derive(Clone, Copy, PartialEq, Deserialize, Serialize, Display, DebugCustom, SmartDefault)]
+#[derive(Clone, Copy, PartialEq, Deserialize, Serialize, Display, Debug, SmartDefault)]
 pub enum NumWithUnit {
-    #[display(fmt = "{}%", .0)]
-    #[debug(fmt = "{}%", .0)]
+    #[display("{}%", _0)]
+    #[debug("{}%", _0)]
     Percent(f32),
-    #[display(fmt = "{}px", .0)]
-    #[debug(fmt = "{}px", .0)]
+    #[display("{}px", _0)]
+    #[debug("{}px", _0)]
     #[default]
     Pixels(i32),
 }
@@ -58,7 +58,7 @@ impl FromStr for NumWithUnit {
 }
 
 #[derive(Clone, Copy, PartialEq, Deserialize, Serialize, Display, Default)]
-#[display(fmt = "{}*{}", x, y)]
+#[display("{}*{}", x, y)]
 pub struct Coords {
     pub x: NumWithUnit,
     pub y: NumWithUnit,