Update to Rust 2018.

diff --git a/README.md b/README.md
index 60824e12bf82bedfd254b73dae912ebcfb01b55e..2599d0bf007a15d6a576f77647ac72e759da93e4 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # enumset
 
 [![Latest Version](https://img.shields.io/crates/v/enumset.svg)](https://crates.io/crates/enumset)
-![Requires rustc 1.30+](https://img.shields.io/badge/rustc-1.30+-red.svg)
+![Requires rustc 1.31+](https://img.shields.io/badge/rustc-1.31+-red.svg)
 [![Rust Documentation](https://img.shields.io/badge/api-rustdoc-blue.svg)](https://docs.rs/enumset)
 
 A library for defining enums that can be used in compact bit sets.

diff --git a/enumset/Cargo.toml b/enumset/Cargo.toml
index 8ff17dca1cf3d40f731f115667f6d9dfcb9afdeb..69b6fe2793a59cd717dd15892e7d07e167c4a22f 100644 (file)
--- a/enumset/Cargo.toml
+++ b/enumset/Cargo.toml
@@ -2,6 +2,7 @@
 name = "enumset"
 version = "0.4.0"
 authors = ["Lymia Aluysia <lymia@lymiahugs.com>"]
+edition = "2018"
 
 description = "A library for creating compact sets of enums."
 keywords = ["enum", "bitset"]

diff --git a/enumset/src/lib.rs b/enumset/src/lib.rs
index 60da4b3719f29acc72e0bc24c3bf240330fb3ec2..59d9fa7764543db4fd4f0598bdb4444a186812b2 100644 (file)
--- a/enumset/src/lib.rs
+++ b/enumset/src/lib.rs
@@ -73,18 +73,14 @@
 //! assert_eq!(set, Enum::A | Enum::E | Enum::G);
 //! ```
 
-extern crate enumset_derive;
-extern crate num_traits;
-#[cfg(feature = "serde")] extern crate serde2 as serde;
-
 pub use enumset_derive::*;
-mod enumset { pub use super::*; }
 
 use core::cmp::Ordering;
 use core::fmt;
 use core::fmt::{Debug, Formatter};
 use core::hash::{Hash, Hasher};
 use core::ops::*;
+use serde2 as serde;
 
 use num_traits::*;
 
@@ -103,7 +99,7 @@ pub mod internal {
     pub extern crate core;
 
     /// A reexport of serde so there is no requirement to depend on serde.
-    #[cfg(feature = "serde")] pub extern crate serde2 as serde;
+    #[cfg(feature = "serde")] pub use serde2 as serde;
 }
 
 mod private {
@@ -446,7 +442,7 @@ impl <T : EnumSetType> PartialEq<T> for EnumSet<T> {
     }
 }
 impl <T : EnumSetType + Debug> Debug for EnumSet<T> {
-    fn fmt(&self, f: &mut Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         let mut is_first = true;
         f.write_str("EnumSet(")?;
         for v in self.iter() {

diff --git a/enumset/tests/ops.rs b/enumset/tests/ops.rs
index 557184d36c88aaf953f0c67c817bc552bd7bba17..8a7579d49593ab16e6b6b7e029138135747d792f 100644 (file)
--- a/enumset/tests/ops.rs
+++ b/enumset/tests/ops.rs
@@ -1,6 +1,5 @@
 #![allow(dead_code)]
 
-extern crate enumset;
 use enumset::*;
 
 #[derive(EnumSetType, Debug)]

diff --git a/enumset/tests/serde.rs b/enumset/tests/serde.rs
index 8375b52896b2f5a24c26cbed03e878f036a06266..875b83c6607b529b5310f53e068b4f1e50fc8f8d 100644 (file)
--- a/enumset/tests/serde.rs
+++ b/enumset/tests/serde.rs
@@ -1,29 +1,23 @@
 #![cfg(feature = "serde")]
 #![allow(dead_code)]
 
-extern crate enumset;
-extern crate serde2 as serde;
-extern crate serde_derive;
-extern crate bincode;
-extern crate serde_json;
-
 use enumset::*;
 use serde_derive::*;
 
 #[derive(Serialize, Deserialize, EnumSetType, Debug)]
 #[enumset(serialize_as_list)]
-#[serde(crate="serde")]
+#[serde(crate="serde2")]
 pub enum ListEnum {
     A, B, C, D, E, F, G, H,
 }
 
-#[derive(::EnumSetType, Debug)]
+#[derive(EnumSetType, Debug)]
 #[enumset(serialize_repr = "u128")]
 pub enum ReprEnum {
     A, B, C, D, E, F, G, H,
 }
 
-#[derive(::EnumSetType, Debug)]
+#[derive(EnumSetType, Debug)]
 #[enumset(serialize_repr = "u128", serialize_deny_unknown)]
 pub enum DenyUnknownEnum {
     A, B, C, D, E, F, G, H,

diff --git a/enumset_derive/Cargo.toml b/enumset_derive/Cargo.toml
index 8bde64fc571eba4fa87f10a19c5ca59833a9e036..ec1e9e305e97dc04bcdd40d8cda615a75f54a5c0 100644 (file)
--- a/enumset_derive/Cargo.toml
+++ b/enumset_derive/Cargo.toml
@@ -2,6 +2,7 @@
 name = "enumset_derive"
 version = "0.4.0"
 authors = ["Lymia Aluysia <lymia@lymiahugs.com>"]
+edition = "2018"
 
 description = "An internal helper crate for enumset."
 

diff --git a/enumset_derive/src/lib.rs b/enumset_derive/src/lib.rs
index d803fe60cfb5ff5d1a32976bec3887236f7ea39c..7fc210895fe33080644759195b1c2989d89c0093 100644 (file)
--- a/enumset_derive/src/lib.rs
+++ b/enumset_derive/src/lib.rs
@@ -1,11 +1,7 @@
 #![recursion_limit="256"]
 #![cfg_attr(feature = "nightly", feature(proc_macro_diagnostic))]
 
-extern crate darling;
-extern crate syn;
 extern crate proc_macro;
-extern crate proc_macro2;
-extern crate quote;
 
 use darling::*;
 use proc_macro::TokenStream;
@@ -125,7 +121,7 @@ fn enum_set_type_impl(
             quote! {
                 if value & !#all_variants != 0 {
                     use #serde::de::Error;
-                    let unexpected = serde::de::Unexpected::Unsigned(value as u64);
+                    let unexpected = #serde::de::Unexpected::Unsigned(value as u64);
                     return #core::prelude::v1::Err(
                         D::Error::custom("enumset contains unknown bits")
                     )