From efc7b3144bacc4d7a73777e3ee1e34a19b882220 Mon Sep 17 00:00:00 2001
From: Alexandre Bury <alexandre.bury@gmail.com>
Date: Mon, 8 Feb 2021 13:41:17 -0800
Subject: [PATCH] Bump enumset and remove unused import

---
 cursive-core/Cargo.toml                      | 2 +-
 cursive-core/src/theme/effect.rs             | 2 +-
 cursive/Cargo.toml                           | 1 -
 cursive/src/backends/puppet/observed.rs      | 2 +-
 cursive/src/backends/puppet/static_values.rs | 2 +-
 cursive/src/lib.rs                           | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/cursive-core/Cargo.toml b/cursive-core/Cargo.toml
index fd23aac..6c3fd53 100644
--- a/cursive-core/Cargo.toml
+++ b/cursive-core/Cargo.toml
@@ -22,7 +22,7 @@ repository = "gyscos/cursive"
 
 [dependencies]
 enum-map = "0.6"
-enumset = "1.0.3"
+enumset = "1.0.4"
 log = "0.4"
 owning_ref = "0.4"
 syn = "1.0"
diff --git a/cursive-core/src/theme/effect.rs b/cursive-core/src/theme/effect.rs
index a681b32..3f294ca 100644
--- a/cursive-core/src/theme/effect.rs
+++ b/cursive-core/src/theme/effect.rs
@@ -1,4 +1,4 @@
-use enumset::{EnumSet, EnumSetType};
+use enumset::EnumSetType;
 
 /// Text effect
 #[allow(clippy::derive_hash_xor_eq)] // We do derive it through EnumSetType
diff --git a/cursive/Cargo.toml b/cursive/Cargo.toml
index 1fda47c..ff1ed9c 100644
--- a/cursive/Cargo.toml
+++ b/cursive/Cargo.toml
@@ -18,7 +18,6 @@ features = ["unstable_scroll", "markdown", "toml"]
 cursive_core = { path = "../cursive-core", version= "0.2.2"}
 crossbeam-channel = "0.5"
 cfg-if = "1"
-enumset = "1.0.3"
 unicode-segmentation = "1"
 unicode-width = "0.1"
 lazy_static = "1"
diff --git a/cursive/src/backends/puppet/observed.rs b/cursive/src/backends/puppet/observed.rs
index cbccdab..2ab6dec 100644
--- a/cursive/src/backends/puppet/observed.rs
+++ b/cursive/src/backends/puppet/observed.rs
@@ -1,8 +1,8 @@
 //! Structs representing output of puppet backend
+use crate::enumset::EnumSet;
 use crate::theme::ColorPair;
 use crate::theme::Effect;
 use crate::Vec2;
-use enumset::EnumSet;
 use std::ops::Index;
 use std::ops::IndexMut;
 use std::rc::Rc;
diff --git a/cursive/src/backends/puppet/static_values.rs b/cursive/src/backends/puppet/static_values.rs
index 7b7aa41..d814047 100644
--- a/cursive/src/backends/puppet/static_values.rs
+++ b/cursive/src/backends/puppet/static_values.rs
@@ -1,11 +1,11 @@
 /// Some default values to Puppet backend.
 use lazy_static::lazy_static;
 
+use crate::enumset::EnumSet;
 use crate::theme::ColorPair;
 use crate::theme::{Color, Effect};
 use crate::Vec2;
 use crate::XY;
-use enumset::EnumSet;
 
 use crate::backends::puppet::observed::*;
 
diff --git a/cursive/src/lib.rs b/cursive/src/lib.rs
index 9d5abdf..a0e64f6 100644
--- a/cursive/src/lib.rs
+++ b/cursive/src/lib.rs
@@ -64,7 +64,7 @@
 //! [`cursive::theme`]: ./theme/index.html
 #![deny(missing_docs)]
 
-pub use enumset;
+pub use cursive_core::enumset;
 
 pub use cursive_core::*;