diff -r 21d3b40b4c0e -r 80840b651721 rust/rhg/src/commands/debugrequirements.rs --- a/rust/rhg/src/commands/debugrequirements.rs Fri Feb 12 16:54:30 2021 +0100 +++ b/rust/rhg/src/commands/debugrequirements.rs Mon Feb 15 20:05:32 2021 +0100 @@ -1,9 +1,5 @@ use crate::error::CommandError; -use crate::ui::Ui; -use clap::ArgMatches; -use hg::config::Config; use hg::repo::Repo; -use std::path::Path; pub const HELP_TEXT: &str = " Print the current repo requirements. @@ -13,13 +9,8 @@ clap::SubCommand::with_name("debugrequirements").about(HELP_TEXT) } -pub fn run( - ui: &Ui, - config: &Config, - repo_path: Option<&Path>, - _args: &ArgMatches, -) -> Result<(), CommandError> { - let repo = Repo::find(config, repo_path)?; +pub fn run(invocation: &crate::CliInvocation) -> Result<(), CommandError> { + let repo = Repo::find(invocation.non_repo_config, invocation.repo_path)?; let mut output = String::new(); let mut requirements: Vec<_> = repo.requirements().iter().collect(); requirements.sort(); @@ -27,6 +18,6 @@ output.push_str(req); output.push('\n'); } - ui.write_stdout(output.as_bytes())?; + invocation.ui.write_stdout(output.as_bytes())?; Ok(()) }