remove redundant "cmd_" prefix from functions in "commands"
PATCH 1/1 remove redundant "cmd_" prefix from functions in "commands"
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%)src/bcachefs.rs +4 -8
@@ -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), };
src/commands/completions.rs renamed from src/commands/cmd_completions.rs +1 -1
@@ -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
src/commands/list.rs renamed from src/commands/cmd_list.rs +1 -1
@@ -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) {
src/commands/mod.rs +13 -8
@@ -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]
src/commands/mount.rs renamed from src/commands/cmd_mount.rs +3 -3
@@ -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.
src/commands/subvolume.rs renamed from src/commands/cmd_subvolume.rs +1 -1
@@ -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 {
Signature · 1 line
2.44.0