It is more idiomatic to use `commands::mount` than `commands::cmd_mount`. No functionality changes intended by this patch.
Signed-off-by: Thomas Bertschinger <[email protected]> --- src/bcachefs.rs | 12 ++++------- .../{cmd_completions.rs => completions.rs} | 2 +- src/commands/{cmd_list.rs => list.rs} | 2 +- src/commands/mod.rs | 21 ++++++++++++------- src/commands/{cmd_mount.rs => mount.rs} | 6 +++--- .../{cmd_subvolume.rs => subvolume.rs} | 2 +- 6 files changed, 23 insertions(+), 22 deletions(-) rename src/commands/{cmd_completions.rs => completions.rs} (89%) rename src/commands/{cmd_list.rs => list.rs} (99%) rename src/commands/{cmd_mount.rs => mount.rs} (98%) rename src/commands/{cmd_subvolume.rs => subvolume.rs} (97%) diff --git a/src/bcachefs.rs b/src/bcachefs.rs index 079a4155..e8099ffa 100644 --- a/src/bcachefs.rs +++ b/src/bcachefs.rs @@ -4,10 +4,6 @@ mod key; use std::ffi::{c_char, CString}; -use commands::cmd_completions::cmd_completions; -use commands::cmd_list::cmd_list; -use commands::cmd_mount::cmd_mount; -use commands::cmd_subvolume::cmd_subvolumes; use commands::logger::SimpleLogger; use bch_bindgen::c; @@ -110,10 +106,10 @@ fn main() { }; let ret = match cmd { - "completions" => cmd_completions(args[1..].to_vec()), - "list" => cmd_list(args[1..].to_vec()), - "mount" => cmd_mount(args, symlink_cmd), - "subvolume" => cmd_subvolumes(args[1..].to_vec()), + "completions" => commands::completions(args[1..].to_vec()), + "list" => commands::list(args[1..].to_vec()), + "mount" => commands::mount(args, symlink_cmd), + "subvolume" => commands::subvolume(args[1..].to_vec()), _ => handle_c_command(args, symlink_cmd), }; diff --git a/src/commands/cmd_completions.rs b/src/commands/completions.rs similarity index 89% rename from src/commands/cmd_completions.rs rename to src/commands/completions.rs index 81ee719f..d4e98569 100644 --- a/src/commands/cmd_completions.rs +++ b/src/commands/completions.rs @@ -12,7 +12,7 @@ fn print_completions<G: Generator>(gen: G, cmd: &mut Command) { generate(gen, cmd, cmd.get_name().to_string(), &mut io::stdout()); } -pub fn cmd_completions(argv: Vec<String>) -> i32 { +pub fn completions(argv: Vec<String>) -> i32 { let cli = Cli::parse_from(argv); print_completions(cli.shell, &mut super::Cli::command()); 0 diff --git a/src/commands/cmd_list.rs b/src/commands/list.rs similarity index 99% rename from src/commands/cmd_list.rs rename to src/commands/list.rs index 8af075af..0ed6be05 100644 --- a/src/commands/cmd_list.rs +++ b/src/commands/list.rs @@ -157,7 +157,7 @@ fn cmd_list_inner(opt: Cli) -> anyhow::Result<()> { } } -pub fn cmd_list(argv: Vec<String>) -> i32 { +pub fn list(argv: Vec<String>) -> i32 { let opt = Cli::parse_from(argv); colored::control::set_override(opt.colorize); if let Err(e) = cmd_list_inner(opt) { diff --git a/src/commands/mod.rs b/src/commands/mod.rs index 70fef82c..c7645926 100644 --- a/src/commands/mod.rs +++ b/src/commands/mod.rs @@ -1,10 +1,15 @@ use clap::Subcommand; pub mod logger; -pub mod cmd_mount; -pub mod cmd_list; -pub mod cmd_completions; -pub mod cmd_subvolume; +pub mod mount; +pub mod list; +pub mod completions; +pub mod subvolume; + +pub use mount::mount; +pub use list::list; +pub use completions::completions; +pub use subvolume::subvolume; #[derive(clap::Parser, Debug)] #[command(name = "bcachefs")] @@ -15,11 +20,11 @@ pub struct Cli { #[derive(Subcommand, Debug)] enum Subcommands { - List(cmd_list::Cli), - Mount(cmd_mount::Cli), - Completions(cmd_completions::Cli), + List(list::Cli), + Mount(mount::Cli), + Completions(completions::Cli), #[command(visible_aliases = ["subvol"])] - Subvolume(cmd_subvolume::Cli), + Subvolume(subvolume::Cli), } #[macro_export] diff --git a/src/commands/cmd_mount.rs b/src/commands/mount.rs similarity index 98% rename from src/commands/cmd_mount.rs rename to src/commands/mount.rs index 8d0e2e90..3cca0a4c 100644 --- a/src/commands/cmd_mount.rs +++ b/src/commands/mount.rs @@ -86,7 +86,7 @@ fn parse_mount_options(options: impl AsRef<str>) -> (Option<String>, libc::c_ulo ) } -fn mount( +fn do_mount( device: String, target: impl AsRef<std::path::Path>, options: impl AsRef<str>, @@ -276,7 +276,7 @@ fn cmd_mount_inner(opt: Cli) -> anyhow::Result<()> { &opt.options ); - mount(devices, mountpoint, &opt.options)?; + do_mount(devices, mountpoint, &opt.options)?; } else { info!( "would mount with params: device: {}, options: {}", @@ -288,7 +288,7 @@ fn cmd_mount_inner(opt: Cli) -> anyhow::Result<()> { Ok(()) } -pub fn cmd_mount(mut argv: Vec<String>, symlink_cmd: Option<&str>) -> i32 { +pub fn mount(mut argv: Vec<String>, symlink_cmd: Option<&str>) -> i32 { // If the bcachefs tool is being called as "bcachefs mount dev ..." (as opposed to via a // symlink like "/usr/sbin/mount.bcachefs dev ...", then we need to pop the 0th argument // ("bcachefs") since the CLI parser here expects the device at position 1. diff --git a/src/commands/cmd_subvolume.rs b/src/commands/subvolume.rs similarity index 97% rename from src/commands/cmd_subvolume.rs rename to src/commands/subvolume.rs index c77eaacd..5f7cdc76 100644 --- a/src/commands/cmd_subvolume.rs +++ b/src/commands/subvolume.rs @@ -36,7 +36,7 @@ enum Subcommands { } } -pub fn cmd_subvolumes(argv: Vec<String>) -> i32 { +pub fn subvolume(argv: Vec<String>) -> i32 { let args = Cli::parse_from(argv); match args.subcommands { -- 2.44.0
