Merge pull request #433 from zhiburt/patch/refactorings-1

Fix test fail
zhiburt · Oct 26, 2024 · 68f139f · 68f139f
2 parents 68f2538 + b6b6ef5
commit 68f139f
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/tabled/Cargo.toml b/tabled/Cargo.toml
@@ -311,8 +311,8 @@ ansi = ["papergrid/ansi", "ansi-str", "ansitok", "std"]
 macros = ["std"]
 
 [dependencies]
-papergrid = { version = "0.12", default-features = false }
-tabled_derive = { version = "0.8", optional = true }
+papergrid = { path = "../papergrid", default-features = false }
+tabled_derive = { path = "../tabled_derive", optional = true }
 ansi-str = { version = "0.8", optional = true }
 ansitok = { version = "0.2", optional = true }
 

diff --git a/tabled/src/tables/compact.rs b/tabled/src/tables/compact.rs
@@ -221,7 +221,7 @@ impl<I, D> CompactTable<I, D> {
         D: Dimension,
         W: std::io::Write,
     {
-        let writer = super::util::utf8_writer::UTF8Writer::new(writer);
+        let writer = crate::util::utf8_writer::UTF8Writer::new(writer);
         self.fmt(writer)
             .map_err(|err| std::io::Error::new(std::io::ErrorKind::Other, err))
     }

diff --git a/tabled/src/tables/iter.rs b/tabled/src/tables/iter.rs
@@ -42,7 +42,7 @@ use crate::{
     settings::{Style, TableOption},
 };
 
-use super::util::utf8_writer::UTF8Writer;
+use crate::util::utf8_writer::UTF8Writer;
 
 /// A table which consumes an [`IntoRecords`] iterator.
 ///

diff --git a/tabled/src/tables/mod.rs b/tabled/src/tables/mod.rs
@@ -18,7 +18,6 @@
 //! A table with a greater control of a layout.
 
 mod compact;
-mod util;
 
 #[cfg(feature = "std")]
 mod extended;

diff --git a/tabled/src/tables/util/mod.rs b/tabled/src/tables/util/mod.rs
diff --git a/tabled/src/util/mod.rs b/tabled/src/util/mod.rs
@@ -1,2 +1,5 @@
 #[cfg(feature = "std")]
 pub(crate) mod string;
+
+#[cfg(feature = "std")]
+pub(crate) mod utf8_writer;
diff --git a/tabled/src/tables/util/utf8_writer.rs → tabled/src/util/utf8_writer.rs b/tabled/src/tables/util/utf8_writer.rs → tabled/src/util/utf8_writer.rs
diff --git a/tabled/tests/core/table_test.rs b/tabled/tests/core/table_test.rs
@@ -740,15 +740,15 @@ mod derived {
                 },
             ]
         }),
-        "+------------------------------------+-----------------+-------------------------------+--------+"
-        "| name                               | author          | text                          | rating |"
-        "+------------------------------------+-----------------+-------------------------------+--------+"
-        "| Rebase vs Merge commit in depth 👋 | Rose Kuphal DVM | A multiline                   | 43     |"
-        "|                                    |                 |  text with 🤯 😳 🥵 🥶        |        |"
-        "|                                    |                 |  a bunch of emojies ☄\u{fe0f} 💥 🔥 🌪 |        |"
-        "+------------------------------------+-----------------+-------------------------------+--------+"
-        "| Keep it simple                     | Unknown         | 🍳                            | 100    |"
-        "+------------------------------------+-----------------+-------------------------------+--------+"
+        "+------------------------------------+-----------------+--------------------------------+--------+"
+        "| name                               | author          | text                           | rating |"
+        "+------------------------------------+-----------------+--------------------------------+--------+"
+        "| Rebase vs Merge commit in depth 👋 | Rose Kuphal DVM | A multiline                    | 43     |"
+        "|                                    |                 |  text with 🤯 😳 🥵 🥶         |        |"
+        "|                                    |                 |  a bunch of emojies ☄️ 💥 🔥 🌪 |        |"
+        "+------------------------------------+-----------------+--------------------------------+--------+"
+        "| Keep it simple                     | Unknown         | 🍳                             | 100    |"
+        "+------------------------------------+-----------------+--------------------------------+--------+"
     );
 }