diff --git a/Cargo.toml b/Cargo.toml index baf5468da..ee72068ea 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -59,7 +59,6 @@ serde_json = "1.0.97" serde_yaml = "0.9.19" smol_str = "0.3.1" strum = "0.27.0" -strum_macros = "0.27.0" thiserror = "2.0.6" typetag = "0.2.7" clap = { version = "4.5.4" } diff --git a/hugr-core/Cargo.toml b/hugr-core/Cargo.toml index 33c62422e..8569de079 100644 --- a/hugr-core/Cargo.toml +++ b/hugr-core/Cargo.toml @@ -50,8 +50,7 @@ petgraph = { workspace = true } serde_json = { workspace = true } delegate = { workspace = true } paste = { workspace = true } -strum = { workspace = true } -strum_macros = { workspace = true } +strum = { workspace = true , features = ["derive"]} semver = { version = "1.0.23", features = ["serde"] } hugr-model = { version = "0.17.1", path = "../hugr-model", optional = true } indexmap.workspace = true diff --git a/hugr-core/src/extension/prelude.rs b/hugr-core/src/extension/prelude.rs index 0f8e369ad..af9d12d6c 100644 --- a/hugr-core/src/extension/prelude.rs +++ b/hugr-core/src/extension/prelude.rs @@ -23,7 +23,7 @@ use crate::types::{ use crate::utils::sorted_consts; use crate::{type_row, Extension}; -use strum_macros::{EnumIter, EnumString, IntoStaticStr}; +use strum::{EnumIter, EnumString, IntoStaticStr}; use super::resolution::{resolve_type_extensions, ExtensionResolutionError, WeakExtensionRegistry}; use super::ExtensionRegistry; diff --git a/hugr-core/src/extension/simple_op.rs b/hugr-core/src/extension/simple_op.rs index f812de8a3..dcae554ec 100644 --- a/hugr-core/src/extension/simple_op.rs +++ b/hugr-core/src/extension/simple_op.rs @@ -203,7 +203,7 @@ impl MakeExtensionOp for T { } /// Load an [MakeOpDef] from its name. -/// See [strum_macros::EnumString]. +/// See [strum::EnumString]. pub fn try_from_name(name: &OpNameRef, def_extension: &ExtensionId) -> Result where T: std::str::FromStr + MakeOpDef, @@ -302,7 +302,7 @@ mod test { use super::*; use lazy_static::lazy_static; - use strum_macros::{EnumIter, EnumString, IntoStaticStr}; + use strum::{EnumIter, EnumString, IntoStaticStr}; #[derive(Clone, Debug, Hash, PartialEq, Eq, EnumIter, IntoStaticStr, EnumString)] enum DummyEnum { diff --git a/hugr-core/src/std_extensions/arithmetic/conversions.rs b/hugr-core/src/std_extensions/arithmetic/conversions.rs index c77c81bfa..78971ab02 100644 --- a/hugr-core/src/std_extensions/arithmetic/conversions.rs +++ b/hugr-core/src/std_extensions/arithmetic/conversions.rs @@ -2,7 +2,7 @@ use std::sync::{Arc, Weak}; -use strum_macros::{EnumIter, EnumString, IntoStaticStr}; +use strum::{EnumIter, EnumString, IntoStaticStr}; use crate::extension::prelude::sum_with_error; use crate::extension::prelude::{bool_t, string_type, usize_t}; diff --git a/hugr-core/src/std_extensions/arithmetic/float_ops.rs b/hugr-core/src/std_extensions/arithmetic/float_ops.rs index beb32346e..08b478535 100644 --- a/hugr-core/src/std_extensions/arithmetic/float_ops.rs +++ b/hugr-core/src/std_extensions/arithmetic/float_ops.rs @@ -2,7 +2,7 @@ use std::sync::{Arc, Weak}; -use strum_macros::{EnumIter, EnumString, IntoStaticStr}; +use strum::{EnumIter, EnumString, IntoStaticStr}; use super::float_types::float64_type; use crate::{ diff --git a/hugr-core/src/std_extensions/arithmetic/int_ops.rs b/hugr-core/src/std_extensions/arithmetic/int_ops.rs index 540b2134b..d0ae7baa7 100644 --- a/hugr-core/src/std_extensions/arithmetic/int_ops.rs +++ b/hugr-core/src/std_extensions/arithmetic/int_ops.rs @@ -20,7 +20,7 @@ use crate::{ }; use lazy_static::lazy_static; -use strum_macros::{EnumIter, EnumString, IntoStaticStr}; +use strum::{EnumIter, EnumString, IntoStaticStr}; mod const_fold; diff --git a/hugr-core/src/std_extensions/collections/array/array_op.rs b/hugr-core/src/std_extensions/collections/array/array_op.rs index 96b23a3a0..2c256880b 100644 --- a/hugr-core/src/std_extensions/collections/array/array_op.rs +++ b/hugr-core/src/std_extensions/collections/array/array_op.rs @@ -2,7 +2,7 @@ use std::sync::{Arc, Weak}; -use strum_macros::{EnumIter, EnumString, IntoStaticStr}; +use strum::{EnumIter, EnumString, IntoStaticStr}; use crate::extension::prelude::{either_type, option_type, usize_t}; use crate::extension::simple_op::{ diff --git a/hugr-core/src/std_extensions/collections/list.rs b/hugr-core/src/std_extensions/collections/list.rs index 53e82dd51..98804bab0 100644 --- a/hugr-core/src/std_extensions/collections/list.rs +++ b/hugr-core/src/std_extensions/collections/list.rs @@ -10,7 +10,7 @@ use std::sync::{Arc, Weak}; use itertools::Itertools; use lazy_static::lazy_static; use serde::{Deserialize, Serialize}; -use strum_macros::{EnumIter, EnumString, IntoStaticStr}; +use strum::{EnumIter, EnumString, IntoStaticStr}; use crate::extension::prelude::{either_type, option_type, usize_t}; use crate::extension::resolution::{ diff --git a/hugr-core/src/std_extensions/logic.rs b/hugr-core/src/std_extensions/logic.rs index 2f042b7bd..fcc8be9d3 100644 --- a/hugr-core/src/std_extensions/logic.rs +++ b/hugr-core/src/std_extensions/logic.rs @@ -2,7 +2,7 @@ use std::sync::{Arc, Weak}; -use strum_macros::{EnumIter, EnumString, IntoStaticStr}; +use strum::{EnumIter, EnumString, IntoStaticStr}; use crate::extension::{ConstFold, ConstFoldResult}; use crate::ops::constant::ValueName; diff --git a/hugr-core/src/std_extensions/ptr.rs b/hugr-core/src/std_extensions/ptr.rs index 16c98352a..fc0b1bbb4 100644 --- a/hugr-core/src/std_extensions/ptr.rs +++ b/hugr-core/src/std_extensions/ptr.rs @@ -2,7 +2,7 @@ use std::sync::{Arc, Weak}; -use strum_macros::{EnumIter, EnumString, IntoStaticStr}; +use strum::{EnumIter, EnumString, IntoStaticStr}; use crate::builder::{BuildError, Dataflow}; use crate::extension::TypeDefBound;