Cleanup

src/cmp.rs

@@ -5,6 +5,7 @@ use proc_macro2;
 use ast;
 use attr;
 use matcher;
+use paths;
 use syn;
 use utils;
 
@@ -31,7 +32,7 @@ pub fn derive_eq(input: &ast::Input) -> proc_macro2::TokenStream {
 /// Derive `PartialEq` for `input`.
 pub fn derive_partial_eq(input: &ast::Input) -> Result<proc_macro2::TokenStream, String> {
     let discriminant_cmp = if let ast::Body::Enum(_) = input.body {
-        let discriminant_path = discriminant_path();
+        let discriminant_path = paths::discriminant_path();
 
         quote!((#discriminant_path(&*self) == #discriminant_path(&*other)))
     } else {
@@ -340,13 +341,4 @@ fn ordering_path() -> syn::Path {
     } else {
         parse_quote!(::std::cmp::Ordering)
     }
-}
-
-/// Return the path of the `discriminant` function, that is `::std::mem::discriminant`.
-fn discriminant_path() -> syn::Path {
-    if cfg!(feature = "use_core") {
-        parse_quote!(::core::mem::discriminant)
-    } else {
-        parse_quote!(::std::mem::discriminant)
-    }
-}
+}

src/hash.rs

@@ -3,6 +3,7 @@ use proc_macro2;
 use ast;
 use attr;
 use matcher;
+use paths;
 use syn;
 use utils;
 
@@ -11,8 +12,9 @@ pub fn derive(input: &ast::Input) -> proc_macro2::TokenStream {
     let hash_trait_path = hash_trait_path();
 
     let discriminant = if let ast::Body::Enum(_) = input.body {
+        let discriminant = paths::discriminant_path();
         Some(quote!(
-            #hash_trait_path::hash(&std::mem::discriminant(self), __state);
+            #hash_trait_path::hash(&#discriminant(self), __state);
         ))
     } else {
         None

src/lib.rs

@@ -28,6 +28,7 @@ mod debug;
 mod default;
 mod hash;
 mod matcher;
+mod paths;
 mod utils;
 
 use proc_macro::TokenStream;

src/paths.rs

@@ -0,0 +1,10 @@
+//! Contains some standard paths.
+
+/// Return the path of the `discriminant` function, that is `::std::mem::discriminant`.
+pub fn discriminant_path() -> syn::Path {
+    if cfg!(feature = "use_core") {
+        parse_quote!(::core::mem::discriminant)
+    } else {
+        parse_quote!(::std::mem::discriminant)
+    }
+}