From 2f077a447c6a52638855e33a816a64602efbe15b Mon Sep 17 00:00:00 2001 From: philipp Date: Tue, 27 Feb 2024 15:24:39 +0100 Subject: [PATCH] remove log crate (in favor of tracing) --- Cargo.lock | 69 +++++++++++++++++-------------- Cargo.toml | 3 +- src/law/mod.rs | 9 ---- src/main.rs | 2 - src/overview/mod.rs | 5 +-- src/paragraph/mod.rs | 4 -- src/paragraph/parser/absatz.rs | 3 -- src/paragraph/parser/abschnitt.rs | 4 -- src/paragraph/parser/liste.rs | 7 ---- src/paragraph/parser/mod.rs | 4 -- 10 files changed, 41 insertions(+), 69 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9092b29..dd85b23 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -223,29 +223,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "env_filter" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" -dependencies = [ - "log", - "regex", -] - -[[package]] -name = "env_logger" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c012a26a7f605efc424dd53697843a72be7dc86ad2d01f7814337794a12231d" -dependencies = [ - "anstream", - "anstyle", - "env_filter", - "humantime", - "log", -] - [[package]] name = "equivalent" version = "1.0.1" @@ -294,12 +271,6 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - [[package]] name = "idna" version = "0.5.0" @@ -439,6 +410,12 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + [[package]] name = "powerfmt" version = "0.2.0" @@ -543,8 +520,6 @@ version = "0.1.0" dependencies = [ "clap", "directories", - "env_logger", - "log", "pretty_assertions", "regex", "roxmltree", @@ -553,6 +528,7 @@ dependencies = [ "time", "toml", "tqdm", + "tracing", "ureq", ] @@ -821,6 +797,37 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + [[package]] name = "unicode-bidi" version = "0.3.15" diff --git a/Cargo.toml b/Cargo.toml index 3040264..7f58dd5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,13 +11,12 @@ time = { version = "0.3", features = [ "formatting" ] } serde = { version = "1.0", features = [ "derive" ] } serde_json = "1.0" roxmltree = "0.19" -env_logger = "0.11" -log = "0.4" tqdm = "0.6" toml = "0.8" clap = { version = "4.5.0", features = ["derive"] } directories = "5.0" regex = "1.10" +tracing = "0.1" [dev-dependencies] pretty_assertions = "1.4" diff --git a/src/law/mod.rs b/src/law/mod.rs index e67e9f5..b0da977 100644 --- a/src/law/mod.rs +++ b/src/law/mod.rs @@ -16,7 +16,6 @@ //! Represents a parsed law text. -use log::{debug, info}; use serde::{Deserialize, Serialize}; use std::{ cell::RefCell, @@ -313,14 +312,10 @@ impl Builder { #[cfg(test)] self.history.push(format!("New_header: {name}")); - info!("new_header={name}"); - let responsible_class = self .responsible_classifier(name) .unwrap_or_else(|| panic!("No classifier for '{name}'")); - debug!("Responsible_class = {responsible_class:#?}"); - let mut heading: ClassifierInstance = name.into(); if let Some(last_instance) = &self.last_instance { @@ -407,7 +402,6 @@ impl Builder { #[cfg(test)] self.history.push(format!("New desc: {desc}")); - debug!("new_desc={desc}"); self.last_instance .clone() .expect("We can only set a description, if we already have received a classifier.") @@ -476,8 +470,6 @@ impl Builder { serde_json::to_string(&content).unwrap() )); - debug!("new_par=par:{par};content:{content:#?}"); - let par_header = self.next_para_header.clone(); self.next_para_header = None; @@ -505,7 +497,6 @@ impl Builder { self.new_header(&next_para_header.clone()); // promote to bigger header :-) } - debug!("new_next_para_header={header}"); self.next_para_header = Some(header.trim().into()); } diff --git a/src/main.rs b/src/main.rs index 0b74d5e..8e8f556 100644 --- a/src/main.rs +++ b/src/main.rs @@ -41,8 +41,6 @@ struct Args { } fn main() { - env_logger::init(); - let args = Args::parse(); if args.clear_cache { diff --git a/src/overview/mod.rs b/src/overview/mod.rs index 622139e..eec9f66 100644 --- a/src/overview/mod.rs +++ b/src/overview/mod.rs @@ -20,7 +20,6 @@ mod ris_structure; use std::path::Path; -use log::info; use serde::Deserialize; use crate::misc::{current_date, get_cache_dir, Error}; @@ -67,7 +66,7 @@ pub fn parse(law_id: usize) -> Result, Error> { let mut skip = true; let mut ret = Vec::new(); loop { - info!("=== Fetching overview page #{page} ==="); + //info!("=== Fetching overview page #{page} ==="); let json = fetch_page(law_id, page)?; let (cont, nodes) = parse_from_str(&json, skip)?; for n in nodes { @@ -116,7 +115,7 @@ fn fetch_page(overview_id: usize, page: usize) -> Result { if let Ok(data) = fs::read_to_string(&expected_filename) { Ok(data) } else { - info!("Not finding law_id {overview_id} (page {page}) in the cache, downloading..."); + //info!("Not finding law_id {overview_id} (page {page}) in the cache, downloading..."); let data = ureq::post("https://data.bka.gv.at/ris/api/v2.6/Bundesrecht") .send_form(&[ ("Applikation", "BrKons"), diff --git a/src/paragraph/mod.rs b/src/paragraph/mod.rs index bb7daab..1fa8191 100644 --- a/src/paragraph/mod.rs +++ b/src/paragraph/mod.rs @@ -25,8 +25,6 @@ use std::{ path::Path, }; -use log::info; - use crate::{ law, misc::{fetch_with_retries, get_cache_dir, Error}, @@ -126,7 +124,6 @@ impl Parser { /// ); /// ``` pub fn parse(&self, url: &str, builder: &mut law::Builder) -> Result { - info!("Parsing {url}"); let xml = fetch(url)?; let xml = xml.replace('\u{a0}', " "); @@ -193,7 +190,6 @@ fn fetch(url: &str) -> Result { if let Ok(data) = fs::read_to_string(&expected_filename) { Ok(data) } else { - info!("Not finding url {url} in the cache, downloading..."); let data = fetch_with_retries(url)?; let path = Path::new(&expected_filename); if let Some(parent) = path.parent() { diff --git a/src/paragraph/parser/absatz.rs b/src/paragraph/parser/absatz.rs index 7cd19da..2b19f52 100644 --- a/src/paragraph/parser/absatz.rs +++ b/src/paragraph/parser/absatz.rs @@ -16,7 +16,6 @@ use std::iter::Peekable; -use log::trace; use roxmltree::{Children, Node}; use crate::law::Content; @@ -40,7 +39,6 @@ impl Absatz { // - String: (optional) paragraph id // - Content: content of the paragraph pub(crate) fn parse_full(c: &mut Peekable) -> (Option, Content) { - trace!("Parsing absatz..."); let absatz = AbsatzAbs::parse(c.next().unwrap()); let par_id = absatz.gldsym; @@ -50,7 +48,6 @@ impl Absatz { // If there's a "liste" after an "absatz", the "liste" should be part of the "absatz" while let Some(child) = c.peek() { if Liste::test(child) { - trace!("Found liste inside absatz, parsing..."); let liste = Liste::parse_full(c).content; content.extend(liste); } else if Table::test(child) { diff --git a/src/paragraph/parser/abschnitt.rs b/src/paragraph/parser/abschnitt.rs index bc7a877..a395825 100644 --- a/src/paragraph/parser/abschnitt.rs +++ b/src/paragraph/parser/abschnitt.rs @@ -17,7 +17,6 @@ use std::collections::HashMap; use std::iter::Peekable; -use log::{debug, trace}; use roxmltree::{Children, Node}; use crate::law; @@ -72,7 +71,6 @@ impl Abschnitt { builder.new_par(par_id, Content::List(contents)); } - debug!("Handling post metadata"); ret.handle_metadata(&mut c, builder); // Skip all UeberschriftTitle and Absatz @@ -103,7 +101,6 @@ impl Abschnitt { // We are done with meta-data parsing if key == "Text" { - trace!("Done parsing metadata, got 'Text'"); break; } @@ -128,7 +125,6 @@ impl Abschnitt { builder.add_next_para_note(value.clone()); } - trace!("Parsed metadata: key='{key}', value='{value}'"); self.metadata.insert(key, value); } } diff --git a/src/paragraph/parser/liste.rs b/src/paragraph/parser/liste.rs index e22471b..f61ea95 100644 --- a/src/paragraph/parser/liste.rs +++ b/src/paragraph/parser/liste.rs @@ -16,7 +16,6 @@ use std::iter::Peekable; -use log::trace; use roxmltree::{Children, Node}; use crate::{ @@ -34,7 +33,6 @@ impl Liste { } pub(crate) fn parse_full(n: &mut Peekable) -> Self { - trace!("Parsing liste..."); Expect::from(n.peek().unwrap()).tag("liste"); let mut content = Vec::new(); @@ -44,17 +42,12 @@ impl Liste { // Parse stuff inside while let Some(child) = c.peek() { if Ziffernliste::test(child) { - trace!("Found Ziffernliste in liste, parsing..."); let liste = Ziffernliste::parse(&mut c); content.push(liste.get_content()); } else if Schlussteil::test(child) { // 162 Schifffahrtsgesetz show use that a 'schlussteil' can be at the start of a list content.push(Content::Text(Schlussteil::parse(c.next().unwrap()).content)); } else { - trace!( - "No more acceptable element in the list found: '{}'", - child.tag_name().name() - ); break; } } diff --git a/src/paragraph/parser/mod.rs b/src/paragraph/parser/mod.rs index 37e51f9..aa6326e 100644 --- a/src/paragraph/parser/mod.rs +++ b/src/paragraph/parser/mod.rs @@ -22,7 +22,6 @@ mod table; use std::{fmt::Display, iter::Peekable}; use abschnitt::Abschnitt; -use log::trace; use roxmltree::{Children, Node}; use crate::{ @@ -117,7 +116,6 @@ impl Risdok { pub(crate) fn from_str(xml: &str, builder: &mut law::Builder) -> Result { let doc = roxmltree::Document::parse(xml)?; - trace!("{doc:?}"); let root = doc.root(); assert_eq!(root.children().count(), 1); Ok(Self::parse(root.children().next().unwrap(), builder)) @@ -183,7 +181,6 @@ impl Listelem { let text = c.next().unwrap().text().unwrap().into(); - trace!("Parsed Listelem with text='{text}'"); Expect::empty(c.next()); Self { symbol, text } @@ -211,7 +208,6 @@ impl Ziffernliste { } pub(crate) fn parse(c: &mut Peekable) -> Self { - trace!("Parsing Ziffernliste..."); let n = c.next().unwrap(); assert!(Self::test(&n));