Skip to content

Commit e86bfd0

Browse files
fix: use more general language in repo-root finding
1 parent df95c12 commit e86bfd0

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

moz-webgpu-cts/src/main.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ fn run(cli: Cli) -> ExitCode {
137137
subcommand,
138138
} = cli;
139139

140-
let checkout = match checkout.map(Ok).unwrap_or_else(search_for_moz_central_ckt) {
140+
let checkout = match checkout.map(Ok).unwrap_or_else(search_for_repo_root) {
141141
Ok(ckt_path) => ckt_path,
142142
Err(AlreadyReportedToCommandline) => return ExitCode::FAILURE,
143143
};
@@ -1499,19 +1499,19 @@ fn read_files_at(
14991499
.chain(file_read_iter.into_iter().flatten())
15001500
}
15011501

1502-
/// Search for a `mozilla-central` checkout either via Mercurial or Git, iterating from the CWD to
1502+
/// Search for source code repository root either via Mercurial or Git, iterating from the CWD to
15031503
/// its parent directories.
15041504
///
15051505
/// This function reports to `log` automatically, so no meaningful [`Err`] value is returned.
1506-
fn search_for_moz_central_ckt() -> Result<PathBuf, AlreadyReportedToCommandline> {
1506+
fn search_for_repo_root() -> Result<PathBuf, AlreadyReportedToCommandline> {
15071507
use lets_find_up::{find_up_with, FindUpKind, FindUpOptions};
15081508

15091509
let find_up_opts = || FindUpOptions {
15101510
cwd: Path::new("."),
15111511
kind: FindUpKind::Dir,
15121512
};
15131513
let find_up = |repo_tech_name, root_dir_name| {
1514-
log::debug!("searching for {repo_tech_name} checkout of `mozilla-central`…");
1514+
log::debug!("searching for {repo_tech_name} repository root…");
15151515
let err = || {
15161516
miette!(
15171517
"failed to find a {} repository ({:?}) in {}",
@@ -1538,13 +1538,13 @@ fn search_for_moz_central_ckt() -> Result<PathBuf, AlreadyReportedToCommandline>
15381538
Err(e2) => {
15391539
log::warn!("{e:?}");
15401540
log::warn!("{e2:?}");
1541-
log::error!("failed to find a Gecko repository root");
1541+
log::error!("failed to automatically find a repository root");
15421542
Err(AlreadyReportedToCommandline)
15431543
}
15441544
})?;
15451545

15461546
log::info!(
1547-
"detected Gecko repository root at {}",
1547+
"detected repository root at {}",
15481548
gecko_source_root.display()
15491549
);
15501550

0 commit comments

Comments
 (0)