Skip to content

Commit 2b8d09f

Browse files
committed
feat: remove log dependency in favor of gix-trace
1 parent 36d34bd commit 2b8d09f

File tree

7 files changed

+11
-15
lines changed

7 files changed

+11
-15
lines changed

Cargo.lock

Lines changed: 1 addition & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gix-attributes/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ serde = ["dep:serde", "bstr/serde", "gix-glob/serde", "kstring/serde"]
2020
gix-path = { version = "^0.9.0", path = "../gix-path" }
2121
gix-quote = { version = "^0.4.7", path = "../gix-quote" }
2222
gix-glob = { version = "^0.11.0", path = "../gix-glob" }
23+
gix-trace = { version = "^0.1.3", path = "../gix-trace" }
2324

2425
bstr = { version = "1.3.0", default-features = false, features = ["std", "unicode"]}
2526
smallvec = "1.10.0"
2627
kstring = "2.0.0"
2728
unicode-bom = "2.0.2"
2829
thiserror = "1.0.26"
2930
serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}
30-
log = "0.4.17"
3131

3232
document-features = { version = "0.2.1", optional = true }
3333

gix-attributes/src/search/attributes.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ impl Search {
124124
impl Pattern for Attributes {
125125
type Value = Value;
126126

127-
fn bytes_to_patterns(bytes: &[u8], source: &std::path::Path) -> Vec<pattern::Mapping<Self::Value>> {
127+
fn bytes_to_patterns(bytes: &[u8], _source: &std::path::Path) -> Vec<pattern::Mapping<Self::Value>> {
128128
fn into_owned_assignments<'a>(
129129
attrs: impl Iterator<Item = Result<crate::AssignmentRef<'a>, crate::name::Error>>,
130130
) -> Option<Assignments> {
@@ -138,8 +138,8 @@ impl Pattern for Attributes {
138138
.collect::<Result<Assignments, _>>();
139139
match res {
140140
Ok(res) => Some(res),
141-
Err(err) => {
142-
log::warn!("{}", err);
141+
Err(_err) => {
142+
gix_trace::warn!("{}", _err);
143143
None
144144
}
145145
}
@@ -148,8 +148,8 @@ impl Pattern for Attributes {
148148
crate::parse(bytes)
149149
.filter_map(|res| match res {
150150
Ok(pattern) => Some(pattern),
151-
Err(err) => {
152-
log::warn!("{}: {}", source.display(), err);
151+
Err(_err) => {
152+
gix_trace::warn!("{}: {}", _source.display(), _err);
153153
None
154154
}
155155
})

gix-config/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ gix-sec = { version = "^0.9.0", path = "../gix-sec" }
2424
gix-ref = { version = "^0.35.0", path = "../gix-ref" }
2525
gix-glob = { version = "^0.11.0", path = "../gix-glob" }
2626

27-
log = "0.4.17"
2827
winnow = { version = "0.5.14", features = ["simd"] }
2928
memchr = "2"
3029
thiserror = "1.0.26"

gix-config/src/file/init/from_paths.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ impl File<'static> {
9292
Err(err) => {
9393
let err = Error::Io { source: err, path };
9494
if options.ignore_io_errors {
95-
log::warn!("ignoring: {err:#?}");
95+
gix_features::trace::warn!("ignoring: {err:#?}");
9696
continue;
9797
} else {
9898
return Err(err);
@@ -104,7 +104,7 @@ impl File<'static> {
104104
Ok(_) => {}
105105
Err(err) => {
106106
if options.ignore_io_errors {
107-
log::warn!(
107+
gix_features::trace::warn!(
108108
"ignoring: {:#?}",
109109
Error::Io {
110110
source: err,

gix/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,6 @@ prodash = { version = "26.2", optional = true, default-features = false, feature
246246
once_cell = "1.14.0"
247247
signal-hook = { version = "0.3.9", default-features = false, optional = true }
248248
thiserror = "1.0.26"
249-
log = "0.4.14"
250249
serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}
251250
smallvec = "1.9.0"
252251
async-std = { version = "1.12.0", optional = true }

gix/src/config/cache/incubate.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ fn load_config(
102102
path: config_path,
103103
};
104104
if lenient {
105-
log::warn!("ignoring: {err:#?}");
105+
gix_trace::warn!("ignoring: {err:#?}");
106106
return Ok(gix_config::File::new(metadata));
107107
} else {
108108
return Err(err);
@@ -117,7 +117,7 @@ fn load_config(
117117
path: config_path,
118118
};
119119
if lenient {
120-
log::warn!("ignoring: {err:#?}");
120+
gix_trace::warn!("ignoring: {err:#?}");
121121
buf.clear();
122122
} else {
123123
return Err(err);

0 commit comments

Comments
 (0)