From 6e85e033782d2668d6290dc2664b1ca021dd8e79 Mon Sep 17 00:00:00 2001 From: mgros Date: Wed, 12 Aug 2026 01:42:38 +0200 Subject: [PATCH] Refactor `strum` dependency to use `derive` feature and replace `strum_macros` imports --- Cargo.toml | 3 +-- src/braille.rs | 2 +- src/speech.rs | 2 +- src/tts.rs | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 78f3e227..b5b30304 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,8 +23,7 @@ sxd-document-no-unsafe = "0.4.2" sxd-xpath-no-unsafe = "0.5.1" yaml-rust = "0.4" # yaml-rust = { version = "0.11", package = "yaml-rust2" } -strum = "0.28" -strum_macros = "0.28" +strum = { version = "0.28", features = ["derive"] } anyhow = "1.0" regex = "1.12.3" dirs = "6.0" diff --git a/src/braille.rs b/src/braille.rs index 8def4c87..1ced5bc8 100644 --- a/src/braille.rs +++ b/src/braille.rs @@ -1,5 +1,5 @@ #![allow(clippy::needless_return)] -use strum_macros::Display; +use strum::Display; use sxd_document_no_unsafe::dom::{Element, ChildOfElement}; use sxd_document_no_unsafe::Package; use sxd_document_no_unsafe::as_str; diff --git a/src/speech.rs b/src/speech.rs index 0c956fe9..71757c81 100644 --- a/src/speech.rs +++ b/src/speech.rs @@ -16,7 +16,7 @@ use sxd_xpath_no_unsafe::{Factory, Value, XPath}; use sxd_xpath_no_unsafe::nodeset::Node; use std::fmt; use std::time::SystemTime; -use strum_macros::Display; +use strum::Display; use crate::definitions::read_definitions_file; use crate::errors::*; use crate::prefs::*; diff --git a/src/tts.rs b/src/tts.rs index 793acbc2..91b05c0a 100644 --- a/src/tts.rs +++ b/src/tts.rs @@ -75,7 +75,7 @@ use std::fmt; use crate::speech::{RulesFor, SpeechRulesWithContext, MyXPath, TreeOrString}; use std::string::ToString; use std::str::FromStr; -use strum_macros::{Display, EnumString}; +use strum::{Display, EnumString}; use regex::Regex; use std::sync::LazyLock; use sxd_xpath_no_unsafe::Value;