Fix platform-specific EOL for test log_crate_proxy

SpriteOvO · Mar 21, 2024 · 281f1aa · 281f1aa
1 parent c2f4edd
commit 281f1aa
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/spdlog/src/formatter/full_formatter.rs b/spdlog/src/formatter/full_formatter.rs
@@ -6,7 +6,7 @@ use cfg_if::cfg_if;
 
 use crate::{
     formatter::{FmtExtraInfo, Formatter, LOCAL_TIME_CACHER},
-    Error, Record, StringBuf, EOL,
+    Error, Record, StringBuf, __EOL,
 };
 
 #[rustfmt::skip]
@@ -95,7 +95,7 @@ impl FullFormatter {
         dest.write_str(record.payload())?;
 
         if self.with_eol {
-            dest.write_str(EOL)?;
+            dest.write_str(__EOL)?;
         }
 
         Ok(FmtExtraInfo {
@@ -125,7 +125,7 @@ mod tests {
     use chrono::prelude::*;
 
     use super::*;
-    use crate::{Level, EOL};
+    use crate::{Level, __EOL};
 
     #[test]
     fn format() {
@@ -138,7 +138,7 @@ mod tests {
             format!(
                 "[{}] [warn] test log content{}",
                 local_time.format("%Y-%m-%d %H:%M:%S.%3f"),
-                EOL
+                __EOL
             ),
             buf
         );

diff --git a/spdlog/src/formatter/journald_formatter.rs b/spdlog/src/formatter/journald_formatter.rs
@@ -9,7 +9,7 @@ use cfg_if::cfg_if;
 
 use crate::{
     formatter::{FmtExtraInfo, Formatter},
-    Error, Record, StringBuf, EOL,
+    Error, Record, StringBuf, __EOL,
 };
 
 #[derive(Clone)]
@@ -47,7 +47,7 @@ impl JournaldFormatter {
 
         dest.write_str("] ")?;
         dest.write_str(record.payload())?;
-        dest.write_str(EOL)?;
+        dest.write_str(__EOL)?;
 
         Ok(FmtExtraInfo {
             style_range: Some(style_range_begin..style_range_end),

diff --git a/spdlog/src/formatter/pattern_formatter/pattern/eol.rs b/spdlog/src/formatter/pattern_formatter/pattern/eol.rs
@@ -22,6 +22,6 @@ impl Pattern for Eol {
         dest: &mut StringBuf,
         _ctx: &mut PatternContext,
     ) -> crate::Result<()> {
-        dest.write_str(crate::EOL).map_err(Error::FormatRecord)
+        dest.write_str(crate::__EOL).map_err(Error::FormatRecord)
     }
 }
diff --git a/spdlog/src/lib.rs b/spdlog/src/lib.rs
@@ -304,9 +304,11 @@ cfg_if! {
 }
 
 #[cfg(not(windows))]
-pub(crate) const EOL: &str = "\n";
+#[doc(hidden)]
+pub const __EOL: &str = "\n";
 #[cfg(windows)]
-pub(crate) const EOL: &str = "\r\n";
+#[doc(hidden)]
+pub const __EOL: &str = "\r\n";
 
 static DEFAULT_LOGGER: OnceCell<ArcSwap<Logger>> = OnceCell::new();
 

diff --git a/spdlog/tests/log_crate_proxy.rs b/spdlog/tests/log_crate_proxy.rs
@@ -1,6 +1,9 @@
 use std::sync::{Arc, Mutex};
 
-use spdlog::formatter::{pattern, PatternFormatter};
+use spdlog::{
+    formatter::{pattern, PatternFormatter},
+    __EOL,
+};
 
 include!(concat!(
     env!("OUT_DIR"),
@@ -27,7 +30,7 @@ fn test_source_location() {
     log::info!("text");
     assert_eq!(
         sink.clone_string(),
-        "(log_crate_proxy::log_crate_proxy.rs) text\n"
+        format!("(log_crate_proxy::log_crate_proxy.rs) text{__EOL}")
     );
 }
 
@@ -44,5 +47,5 @@ fn test_target() {
     log::set_max_level(log::LevelFilter::Trace);
 
     log::info!(target: "MyLogger", "body");
-    assert_eq!(sink.clone_string(), "[MyLogger] body\n");
+    assert_eq!(sink.clone_string(), format!("[MyLogger] body{__EOL}"));
 }
diff --git a/spdlog/tests/pattern.rs b/spdlog/tests/pattern.rs
@@ -11,7 +11,7 @@ use spdlog::{
     formatter::{pattern, Formatter, Pattern, PatternFormatter},
     prelude::*,
     sink::Sink,
-    StringBuf,
+    StringBuf, __EOL,
 };
 
 include!(concat!(
@@ -246,12 +246,7 @@ fn test_builtin_patterns() {
             res = replace_substring(res, WEEKDAY_NAMES, "{weekday_name}");
             res = replace_substring(res, MONTH_NAMES, "{month_name}");
             res = replace_substring(res, AM_PM, "{am_pm}");
-
-            #[cfg(not(windows))]
-            const EOL: &str = "\n";
-            #[cfg(windows)]
-            const EOL: &str = "\r\n";
-            res = replace_substring(res, [EOL], "{eol}");
+            res = replace_substring(res, [__EOL], "{eol}");
 
             if res.starts_with('+') || res.starts_with('-') {
                 res.replace_range(0..1, "{begin_sign}");