From 4877f5675243564a4086fa8fb618a1d6046b30ac Mon Sep 17 00:00:00 2001
From: picoHz <53327867+picoHz@users.noreply.github.com>
Date: Tue, 9 Aug 2022 09:15:36 +0900
Subject: [PATCH] rename strum::EnumProperty to avoid name conflict

---
 src/config.rs    | 2 +-
 src/stock_str.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/config.rs b/src/config.rs
index e5f2863d4..d3fe61d25 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,7 +1,7 @@
 //! # Key-value configuration management.
 
 use anyhow::{ensure, Context as _, Result};
-use strum::{EnumProperty, IntoEnumIterator};
+use strum::{EnumProperty as EnumPropertyTrait, IntoEnumIterator};
 use strum_macros::{AsRefStr, Display, EnumIter, EnumProperty, EnumString};
 
 use crate::blob::BlobObject;
diff --git a/src/stock_str.rs b/src/stock_str.rs
index 27033d696..e0014440b 100644
--- a/src/stock_str.rs
+++ b/src/stock_str.rs
@@ -4,7 +4,7 @@ use std::future::Future;
 use std::pin::Pin;
 
 use anyhow::{bail, Error};
-use strum::EnumProperty;
+use strum::EnumProperty as EnumPropertyTrait;
 use strum_macros::EnumProperty;
 
 use crate::blob::BlobObject;