fix imports

jxl/src/lib.rs

@@ -13,5 +13,4 @@ pub mod headers;
 pub mod icc;
 pub mod image;
 pub mod render;
-#[macro_use]
 pub mod util;

jxl/src/render/stages/upsample.rs

@@ -87,8 +87,8 @@ impl RenderPipelineStage for Upsample2x {
 #[cfg(test)]
 mod test {
     use super::*;
-    use util::test::assert_almost_eq;
-    use crate::{error::Result, image::Image, render::test::make_and_run_simple_pipeline};
+    //use util::test::assert_almost_eq;
+    use crate::{error::Result, image::Image, render::test::make_and_run_simple_pipeline, util::test::assert_almost_eq};
     use test_log::test;
 
     #[test]

jxl/src/util.rs

@@ -3,9 +3,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-#[macro_use]
 pub mod test;
-pub use test::assert_almost_eq;
 
 mod bits;
 #[allow(unused)]

jxl/src/util/test.rs

@@ -3,6 +3,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+
 macro_rules! assert_almost_eq {
     ($left:expr, $right:expr, $max_error:expr $(,)?) => {
         match (&$left, &$right, &$max_error) {
@@ -23,6 +24,7 @@ macro_rules! assert_almost_eq {
         }
     };
 }
+pub(crate) use assert_almost_eq;
 
 
 #[cfg(test)]