fix(snap)!: Move path root macros to utils

Author: epage

crates/snapbox/src/data/mod.rs

@@ -174,12 +174,12 @@ macro_rules! file {
         $crate::Data::read_from(&path, Some($crate::data::DataFormat:: $type))
     }};
     [$path:literal] => {{
-        let mut path = $crate::current_dir!();
+        let mut path = $crate::utils::current_dir!();
         path.push($path);
         $crate::Data::read_from(&path, None)
     }};
     [$path:literal : $type:ident] => {{
-        let mut path = $crate::current_dir!();
+        let mut path = $crate::utils::current_dir!();
         path.push($path);
         $crate::Data::read_from(&path, Some($crate::data::DataFormat:: $type))
     }};
@@ -201,7 +201,7 @@ macro_rules! str {
     [$data:literal] => { $crate::str![[$data]] };
     [[$data:literal]] => {{
         let position = $crate::data::Position {
-            file: $crate::path::current_rs!(),
+            file: $crate::utils::current_rs!(),
             line: line!(),
             column: column!(),
         };

crates/snapbox/src/macros.rs

@@ -50,7 +50,7 @@ macro_rules! assert_data_eq {
 #[macro_export]
 macro_rules! current_dir {
     () => {{
-        let root = $crate::path::cargo_rustc_current_dir!();
+        let root = $crate::utils::cargo_rustc_current_dir!();
         let file = ::std::file!();
         let rel_path = ::std::path::Path::new(file).parent().unwrap();
         root.join(rel_path)
@@ -62,7 +62,7 @@ macro_rules! current_dir {
 #[macro_export]
 macro_rules! current_rs {
     () => {{
-        let root = $crate::path::cargo_rustc_current_dir!();
+        let root = $crate::utils::cargo_rustc_current_dir!();
         let file = ::std::file!();
         let rel_path = ::std::path::Path::new(file);
         root.join(rel_path)

crates/snapbox/src/path/mod.rs

@@ -20,10 +20,3 @@ pub use ops::Walk;
 pub(crate) use ops::canonicalize;
 pub(crate) use ops::display_relpath;
 pub(crate) use ops::shallow_copy;
-
-#[doc(inline)]
-pub use crate::cargo_rustc_current_dir;
-#[doc(inline)]
-pub use crate::current_dir;
-#[doc(inline)]
-pub use crate::current_rs;

crates/snapbox/src/utils/mod.rs

@@ -1,3 +1,10 @@
 mod lines;
 
 pub use lines::LinesWithTerminator;
+
+#[doc(inline)]
+pub use crate::cargo_rustc_current_dir;
+#[doc(inline)]
+pub use crate::current_dir;
+#[doc(inline)]
+pub use crate::current_rs;