Skip to content

Commit 5595f43

Browse files
committed
Remove verbose_than function
1 parent 7cfd7d3 commit 5595f43

File tree

2 files changed

+5
-15
lines changed

2 files changed

+5
-15
lines changed

src/bootstrap/src/core/build_steps/compile.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1902,12 +1902,7 @@ impl Step for Sysroot {
19021902
if !path.parent().is_none_or(|p| p.ends_with(&suffix)) {
19031903
return true;
19041904
}
1905-
if !filtered_files.iter().all(|f| f != path.file_name().unwrap()) {
1906-
builder.verbose_than(1, || println!("ignoring {}", path.display()));
1907-
false
1908-
} else {
1909-
true
1910-
}
1905+
filtered_files.iter().all(|f| f != path.file_name().unwrap())
19111906
});
19121907
}
19131908

src/bootstrap/src/lib.rs

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1092,13 +1092,6 @@ impl Build {
10921092
self.verbosity > level
10931093
}
10941094

1095-
/// Runs a function if verbosity is greater than `level`.
1096-
fn verbose_than(&self, level: usize, f: impl Fn()) {
1097-
if self.is_verbose_than(level) {
1098-
f()
1099-
}
1100-
}
1101-
11021095
fn info(&self, msg: &str) {
11031096
match self.config.get_dry_run() {
11041097
DryRun::SelfCheck => (),
@@ -1816,7 +1809,6 @@ impl Build {
18161809
if self.config.dry_run() {
18171810
return;
18181811
}
1819-
self.verbose_than(1, || println!("Copy/Link {src:?} to {dst:?}"));
18201812
if src == dst {
18211813
return;
18221814
}
@@ -1933,7 +1925,10 @@ impl Build {
19331925
return;
19341926
}
19351927
let dst = dstdir.join(src.file_name().unwrap());
1936-
self.verbose_than(1, || println!("Install {src:?} to {dst:?}"));
1928+
1929+
#[cfg(feature = "tracing")]
1930+
let _span = trace_io!("install", ?src, ?dst);
1931+
19371932
t!(fs::create_dir_all(dstdir));
19381933
if !src.exists() {
19391934
panic!("ERROR: File \"{}\" not found!", src.display());

0 commit comments

Comments
 (0)