cleanup

Author: darrell-roberts

Cargo.toml

@@ -36,4 +36,3 @@ inherits = "release"
 [workspace.dependencies]
 log = "0.4"
 flexi_logger = "0.28"
-anyhow = "1"

cli/Cargo.toml

@@ -23,6 +23,6 @@ rayon = "1.10"
 serde = { version = "1", features = ["derive"] }
 toml = "0.8"
 typeshare-core = { path = "../core", version = "1.10.0-beta.7" }
-anyhow.workspace = true
 log.workspace = true
 flexi_logger.workspace = true
+anyhow = "1"

core/Cargo.toml

@@ -7,7 +7,6 @@ description = "The code generator used by Typeshare's command line tool"
 repository = "https://github.com/1Password/typeshare"
 
 [dependencies]
-anyhow.workspace = true
 proc-macro2 = "1"
 quote = "1"
 syn = { version = "2", features = ["full", "visit"] }
@@ -23,3 +22,4 @@ expect-test = "1.5"
 once_cell = "1"
 cool_asserts = "2"
 syn = { version = "2", features = ["full", "visit", "extra-traits"] }
+anyhow = "1"

core/src/target_os_check.rs

@@ -1,6 +1,6 @@
 //! Optional checks for `#[cfg(target_os = "target")]
 use crate::parser::get_meta_items;
-use log::{debug, error, log_enabled};
+use log::{debug, error, log_enabled, warn};
 use quote::ToTokens;
 use std::collections::VecDeque;
 use syn::{punctuated::Punctuated, Attribute, Expr, ExprLit, Lit, Meta, Token};
@@ -32,28 +32,33 @@ impl Iterator for TargetOsIterator {
 
     fn next(&mut self) -> Option<Self::Item> {
         while let Some(meta) = self.meta.pop_front() {
-            debug!("working on meta");
             if meta.path().is_ident("not") {
                 debug!("encountered not");
                 self.scope = TargetScope::Reject
             }
 
             match meta {
                 Meta::Path(p) => {
-                    debug!("\tencountered path: {p:?}");
+                    if log_enabled!(log::Level::Warn) {
+                        warn!(
+                            "Encountered path while traversing target_os candidates: {}",
+                            p.into_token_stream()
+                        );
+                    }
                 }
                 Meta::List(meta_list) => {
                     let nested_meta_list = meta_list
                         .parse_args_with(Punctuated::<Meta, Token![,]>::parse_terminated)
                         .inspect_err(|err| {
-                            error!("\tfailed to parse nested meta: {err}");
+                            error!("Failed to parse nested meta while traversing target_os candidates: {err}");
                         })
                         .ok()?;
                     debug!("\texpanding with {} meta", nested_meta_list.len());
                     self.meta.extend(nested_meta_list);
                 }
                 Meta::NameValue(nv) => {
-                    debug!("\tworking on NameValue: {nv:?}");
+                    #[cfg(test)]
+                    debug!("\tworking with NameValue: {nv:?}");
                     if let Some(value) =
                         nv.path
                             .is_ident("target_os")