fix compilation error

https://travis-ci.org/colin-kiegel/rust-pretty-assertions/builds/493893359
rust-pretty-assertions · Feb 15, 2019 · 55ebfea · 55ebfea
1 parent 29a4996
commit 55ebfea
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 25 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -72,7 +72,7 @@ mod format_changeset;
 use std::fmt::{self, Debug, Display};
 use difference::Changeset;
 
-use format_changeset::format_changeset;
+use crate::format_changeset::format_changeset;
 pub use ansi_term::Style;
 
 #[doc(hidden)]
@@ -129,9 +129,17 @@ macro_rules! assert_eq {
 }
 
 #[macro_export]
-#[doc(hidden)]
-macro_rules! __assert_ne {
-    ($left:expr, $right:expr, $maybe_semicolon:expr, $($arg:tt)+) => ({
+macro_rules! assert_ne {
+    ($left:expr, $right:expr) => ({
+        assert_ne!(@ $left, $right, "", "");
+    });
+    ($left:expr, $right:expr,) => ({
+        assert_ne!(@ $left, $right, "", "");
+    });
+    ($left:expr, $right:expr, $($arg:tt)+) => ({
+        assert_ne!(@ $left, $right, ": ", $($arg)+);
+    });
+    (@ $left:expr, $right:expr, $maybe_semicolon:expr, $($arg:tt)+) => ({
         match (&($left), &($right)) {
             (left_val, right_val) => {
                 if *left_val == *right_val {
@@ -170,16 +178,3 @@ macro_rules! __assert_ne {
         }
     });
 }
-
-#[macro_export]
-macro_rules! assert_ne {
-    ($left:expr, $right:expr) => ({
-        __assert_ne!($left, $right, "", "");
-    });
-    ($left:expr, $right:expr,) => ({
-        __assert_ne!($left, $right, "", "");
-    });
-    ($left:expr, $right:expr, $($arg:tt)+) => ({
-        __assert_ne!($left, $right, ": ", $($arg)+);
-    });
-}
diff --git a/tests/assert_eq.rs b/tests/assert_eq.rs
@@ -1,5 +1,5 @@
-#[macro_use]
-extern crate pretty_assertions;
+#[allow(unused_imports)]
+use pretty_assertions::{assert_eq, assert_ne};
 extern crate difference;
 
 #[test]

diff --git a/tests/assert_ne.rs b/tests/assert_ne.rs
@@ -1,6 +1,5 @@
-#[macro_use]
-extern crate pretty_assertions;
-
+#[allow(unused_imports)]
+use pretty_assertions::{assert_eq, assert_ne};
 #[test]
 #[should_panic(expected = r#"assertion failed: `(left != right)`
 

diff --git a/tests/pretty_string.rs b/tests/pretty_string.rs
@@ -1,6 +1,5 @@
-#[macro_use]
-extern crate pretty_assertions;
-
+#[allow(unused_imports)]
+use pretty_assertions::{assert_eq, assert_ne};
 use std::fmt;
 /// Wrapper around string slice that makes debug output `{:?}` to print string same way as `{}`.
 /// Used in different `assert*!` macros in combination with `pretty_assertions` crate to make