Fix crate for 1.31.0

diff --git a/enumset/src/lib.rs b/enumset/src/lib.rs
index 72a9ac65990b208d3e292e86f18917db208aa025..327394f1cfd26839e94647f6c902a3bc36fd1e45 100644 (file)
--- a/enumset/src/lib.rs
+++ b/enumset/src/lib.rs
@@ -95,7 +95,7 @@ pub mod internal {
     }
 
     /// A reexport of core to allow our macros to be generic to std vs core.
-    pub extern crate core;
+    pub use ::core as core_export;
 
     /// A reexport of serde so there is no requirement to depend on serde.
     #[cfg(feature = "serde")] pub use serde2 as serde;
@@ -115,9 +115,9 @@ pub mod internal {
             where Self: EnumSetType;
     }
 }
-use internal::EnumSetTypePrivate;
-#[cfg(feature = "serde")] use internal::serde;
-#[cfg(feature = "serde")] use serde::{Serialize, Deserialize};
+use crate::internal::EnumSetTypePrivate;
+#[cfg(feature = "serde")] use crate::internal::serde;
+#[cfg(feature = "serde")] use crate::serde::{Serialize, Deserialize};
 
 mod private {
     use super::*;
@@ -137,7 +137,7 @@ mod private {
     prim!(u64 , 64 );
     prim!(u128, 128);
 }
-use private::EnumSetTypeRepr;
+use crate::private::EnumSetTypeRepr;
 
 /// The trait used to define enum types that may be used with [`EnumSet`].
 ///

diff --git a/enumset_derive/src/lib.rs b/enumset_derive/src/lib.rs
index d18523a9a4708b75ed73157311c6bf106b9d738c..e70a49b8a1552b6ebff1acf9ad5d868c696feebb 100644 (file)
--- a/enumset_derive/src/lib.rs
+++ b/enumset_derive/src/lib.rs
@@ -26,7 +26,7 @@ fn enum_set_type_impl(
     name: &Ident, all_variants: u128, repr: Ident, attrs: EnumsetAttrs,
 ) -> SynTokenStream {
     let typed_enumset = quote!(::enumset::EnumSet<#name>);
-    let core = quote!(::enumset::internal::core);
+    let core = quote!(::enumset::internal::core_export);
     #[cfg(feature = "serde")]
     let serde = quote!(::enumset::internal::serde);