Replace env_logger with simple_logger

.github/workflows/rpackage.yml

@@ -31,7 +31,6 @@ jobs:
           - { os: ubuntu-latest, r: "oldrel-1" }
           - { os: ubuntu-latest, r: "oldrel-2" }
 
-
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
       R_KEEP_PKG_SOURCE: yes
@@ -57,5 +56,5 @@ jobs:
       - uses: r-lib/actions/check-r-package@v2
         with:
           upload-snapshots: true
-          build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")'
+          build_args: 'c("--no-manual", "--compact-vignettes=gs+qpdf")'
           working-directory: "./antidotum/tergo"

antidotum/tergo/R/styling.R

@@ -17,6 +17,7 @@
 #' @examples
 #' style()
 #' style(config_file = "tergo.toml", configuration = list())
+#'
 style <- function(config_file = "tergo.toml", configuration = list(), ...) {
   style_pkg(path = getwd(), config_file = config_file, configuration = configuration)
   invisible(NULL)
@@ -46,6 +47,7 @@ style <- function(config_file = "tergo.toml", configuration = list(), ...) {
 #' @examples
 #' style_pkg()
 #' style_pkg(path = "./tergo", config_file = "custom_tergo.toml", verbose = TRUE)
+#'
 style_pkg <- function(path = ".",
                       config_file = "tergo.toml",
                       configuration = list(),
@@ -180,6 +182,7 @@ style_pkg <- function(path = ".",
 #' close(file_conn)
 #' style_file(file = tmp, configuration = list())
 #' unlink(tmp)
+#'
 style_file <- function(file, configuration = list()) {
   ignored_paths <- configuration$exclusion_list
   if (!is.null(ignored_paths)) {
@@ -256,11 +259,11 @@ style_file_internal <- function(file, configuration, ignored_paths) {
 #'
 #' @export
 #' @examples
-#' code <- "function(){}"
-#' style_text(code)
+#' code <- "a+b"
+#' styled <- style_text(code)
+#' code <- c("a+b", "A<-7")
+#' styled <- style_text(code)
 #'
-#' code <- c("function(){}", "A<-7")
-#' style_text(code)
 style_text <- function(text, configuration = list()) {
   vapply(
     X = text,

antidotum/tergo/src/rust/Cargo.toml

@@ -9,7 +9,7 @@ name = "tergo"
 
 [dependencies]
 tergo-lib = "0.2.9"
-toml = "0.8.19"
+toml = "0.8.20"
 extendr-api = "*"
 
 [workspace]

aqua/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tergo-tokenizer"
-version = "0.2.3"
+version = "0.2.4"
 edition = "2021"
 authors = ["Konrad Pagacz [email protected]"]
 description = "R language tokenizer"
@@ -10,5 +10,9 @@ repository = "https://github.com/kpagacz/tergo/tree/main/aqua"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-env_logger = "0.11.5"
-log = "0.4.21"
+log = "0.4.25"
+
+[dev-dependencies]
+simple_logger = { version = "5.0.0", default-features = false, features = [
+  "timestamps",
+] }

aqua/tests/tokenizer_tests.rs

@@ -1,7 +1,10 @@
 use tergo_tokenizer::{tokenizer::Tokenizer, tokens::Token};
 
 fn log_init() {
-    let _ = env_logger::builder().is_test(true).try_init();
+    match simple_logger::init_with_env() {
+        Ok(_) => {}
+        Err(err) => println!("Error initializing logger: {:?}", err),
+    }
 }
 
 #[test]

balnea/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tergo-lib"
-version = "0.2.10"
+version = "0.2.11"
 edition = "2021"
 description = "A tool to format R code"
 license = "MIT"
@@ -12,9 +12,13 @@ repository = "https://github.com/kpagacz/tergo/tree/main/balnea"
 path = "src/lib.rs"
 
 [dependencies]
-tokenizer = { package = "tergo-tokenizer", path = "../aqua", version = "0.2.3" }
-parser = { package = "tergo-parser", path = "../spongia", version = "0.2.4" }
-formatter = { package = "tergo-formatter", path = "../unguentum", version = "0.2.9" }
-log = "0.4.21"
-env_logger = "0.11.3"
-serde = { version = "1.0.210", features = ["derive"] }
+tokenizer = { package = "tergo-tokenizer", path = "../aqua", version = "0.2.4" }
+parser = { package = "tergo-parser", path = "../spongia", version = "0.2.5" }
+formatter = { package = "tergo-formatter", path = "../unguentum", version = "0.2.10" }
+log = "0.4.25"
+serde = { version = "1.0.217", features = ["derive"] }
+
+[dev-dependencies]
+simple_logger = { version = "5.0.0", features = [
+  "timestamps",
+], default-features = false }

balnea/tests/format_integration.rs

@@ -3,7 +3,11 @@ use formatter::config::{AllowNlAfterAssignment, EmbracingOpNoNl, Indent, LineLen
 use tergo_lib::{tergo_format, Config};
 
 fn log_init() {
-    let _ = env_logger::builder().is_test(true).try_init();
+    let res = simple_logger::init_with_env();
+    match res {
+        Ok(_) => {}
+        Err(err) => println!("Failed to initialize logger {:?}", err),
+    }
 }
 
 macro_rules! comparison_test {

scopa/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "scopa"
-version = "0.1.1"
+version = "0.1.2"
 edition = "2021"
 
 [lib]
@@ -9,7 +9,10 @@ path = "./src/lib.rs"
 
 [dependencies]
 wit-bindgen = "0.32.0"
-tergo-lib = { path = "../balnea", version = "0.2.10" }
+tergo-lib = { path = "../balnea", version = "0.2.11" }
+simple_logger = { version = "5.0.0", default-features = false, features = [
+  "timestamps",
+] }
 
 [dev-dependencies]
-wasm-tools = "1.217.0"
+wasm-tools = "1.217.1"

scopa/src/lib.rs

@@ -8,6 +8,7 @@ struct Tergo;
 
 impl Guest for Tergo {
     fn format(code: String) -> Result<String, String> {
+        simple_logger::init_with_env().map_err(|err| format!("Error initializing logger: {:?}", err))?;
         tergo_format(&code, None)
     }
 }

spongia/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tergo-parser"
-version = "0.2.4"
+version = "0.2.5"
 edition = "2021"
 license = "MIT"
 description = "Parser for tergo"
@@ -10,10 +10,10 @@ repository = "https://github.com/kpagacz/tergo/tree/main/spongia"
 
 [dependencies]
 nom = "7.1.3"
-nom_locate = "4.2.0"
-anyhow = "1.0.81"
-tokenizer = { package = "tergo-tokenizer", path = "../aqua", version = "0.2.3" }
+tokenizer = { package = "tergo-tokenizer", path = "../aqua", version = "0.2.4" }
 log = "0.4.21"
 
 [dev-dependencies]
-env_logger = "0.11.3"
+simple_logger = { version = "5.0.0", default-features = false, features = [
+  "timestamps",
+] }

spongia/src/compound.rs

@@ -247,7 +247,10 @@ mod tests {
     use tokenizer::Token::*;
 
     fn log_init() {
-        let _ = env_logger::builder().is_test(true).try_init();
+        match simple_logger::init_with_env() {
+            Ok(_) => {}
+            Err(err) => println!("Error initializing logger: {:?}", err),
+        }
     }
 
     #[test]

spongia/tests/integration_test.rs

@@ -7,7 +7,10 @@ use tergo_parser::{parse, pre_parse};
 use tokenizer::Tokenizer;
 
 fn log_init() {
-    let _ = env_logger::builder().is_test(true).try_init();
+    match simple_logger::init_with_env() {
+        Ok(_) => {}
+        Err(err) => println!("Error initializing logger: {:?}", err),
+    }
 }
 
 #[test]

tergo/Cargo.toml

@@ -7,8 +7,10 @@ description = "Format code written in R"
 repository = "https://github.com/kpagacz/tergo/"
 
 [dependencies]
-clap = { version = "4.5.17", features = ["derive"] }
-env_logger = "0.11.5"
-log = "0.4.22"
-tergo-lib = { path = "../balnea", version = "0.2.9" }
-toml = "0.8.19"
+clap = { version = "4.5.18", features = ["derive"] }
+log = "0.4.25"
+simple_logger = { version = "5.0.0", default-features = false, features = [
+  "timestamps",
+] }
+tergo-lib = { path = "../balnea", version = "0.2.11" }
+toml = "0.8.20"

tergo/src/main.rs

@@ -118,7 +118,10 @@ fn main() {
     if std::env::var("RUST_LOG").is_err() {
         std::env::set_var("RUST_LOG", "info");
     }
-    env_logger::init();
+    match simple_logger::init_with_env() {
+        Ok(_) => {}
+        Err(err) => println!("Failed to initialize logger: {:?}", err),
+    }
     let cli = Cli::parse();
 
     let path = PathBuf::from_str(&cli.path).unwrap();

unguentum/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tergo-formatter"
-version = "0.2.9"
+version = "0.2.10"
 edition = "2021"
 license = "MIT"
 description = "Formatter for tergo"
@@ -9,11 +9,13 @@ repository = "https://github.com/kpagacz/tergo/tree/main/unguentum"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-tokenizer = { package = "tergo-tokenizer", path = "../aqua", version = "0.2.3" }
+tokenizer = { package = "tergo-tokenizer", path = "../aqua", version = "0.2.4" }
 parser = { package = "tergo-parser", path = "../spongia", version = "0.2.4" }
-log = "0.4.21"
-serde = { version = "1.0.210", features = ["derive"] }
+log = "0.4.25"
+serde = { version = "1.0.217", features = ["derive"] }
 
 [dev-dependencies]
-env_logger = "0.11.3"
-toml = "0.8.19"
+simple_logger = { version = "5.0.0", default-features = false, features = [
+  "timestamps",
+] }
+toml = "0.8.20"

unguentum/src/format.rs

@@ -447,7 +447,10 @@ mod tests {
     use super::*;
 
     fn log_init() {
-        let _ = env_logger::builder().is_test(true).try_init();
+        match simple_logger::init_with_env() {
+            Ok(_) => {}
+            Err(err) => println!("Failed to initialize logger: {:?}", err),
+        }
     }
 
     #[test]

unguentum/tests/config_parsing.rs

@@ -1,7 +1,10 @@
 use tergo_formatter::config::{Config, FunctionLineBreaks};
 
 fn log_init() {
-    let _ = env_logger::builder().is_test(true).try_init();
+    match simple_logger::init_with_env() {
+        Ok(_) => {}
+        Err(err) => println!("Error initializing logger: {:?}", err),
+    }
 }
 
 #[test]