summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergio Benitez <SergioBenitez@users.noreply.github.com>2022-06-10 11:10:09 -0700
committerGitHub <noreply@github.com>2022-06-10 14:10:09 -0400
commit48646e3451798941cf449cbbb86049e9b44914c1 (patch)
tree5bd27f3e76944eac977e3b7cd5950081bea03c14
parent985394a19edbe878449bff0086c831a46c79e7af (diff)
globset: make 'log' an optional feature
PR #1910
-rw-r--r--crates/globset/Cargo.toml3
-rw-r--r--crates/globset/src/lib.rs14
2 files changed, 14 insertions, 3 deletions
diff --git a/crates/globset/Cargo.toml b/crates/globset/Cargo.toml
index 51ca8052..5b360f5a 100644
--- a/crates/globset/Cargo.toml
+++ b/crates/globset/Cargo.toml
@@ -23,7 +23,7 @@ bench = false
aho-corasick = "0.7.3"
bstr = { version = "0.2.0", default-features = false, features = ["std"] }
fnv = "1.0.6"
-log = "0.4.5"
+log = { version = "0.4.5", optional = true }
regex = { version = "1.1.5", default-features = false, features = ["perf", "std"] }
serde = { version = "1.0.104", optional = true }
@@ -33,5 +33,6 @@ lazy_static = "1"
serde_json = "1.0.45"
[features]
+default = ["log"]
simd-accel = []
serde1 = ["serde"]
diff --git a/crates/globset/src/lib.rs b/crates/globset/src/lib.rs
index d14685f1..c8072b2d 100644
--- a/crates/globset/src/lib.rs
+++ b/crates/globset/src/lib.rs
@@ -125,6 +125,16 @@ mod pathutil;
#[cfg(feature = "serde1")]
mod serde_impl;
+#[cfg(feature = "log")]
+macro_rules! debug {
+ ($($token:tt)*) => (::log::debug!($($token)*);)
+}
+
+#[cfg(not(feature = "log"))]
+macro_rules! debug {
+ ($($token:tt)*) => {};
+}
+
/// Represents an error that can occur when parsing a glob pattern.
#[derive(Clone, Debug, Eq, PartialEq)]
pub struct Error {
@@ -413,12 +423,12 @@ impl GlobSet {
required_exts.add(i, ext, p.regex().to_owned());
}
MatchStrategy::Regex => {
- log::debug!("glob converted to regex: {:?}", p);
+ debug!("glob converted to regex: {:?}", p);
regexes.add(i, p.regex().to_owned());
}
}
}
- log::debug!(
+ debug!(
"built glob set; {} literals, {} basenames, {} extensions, \
{} prefixes, {} suffixes, {} required extensions, {} regexes",
lits.0.len(),