X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=rust-src%2Fmount%2Fsrc%2Fmain.rs;h=66a60d9a62b70e5ef4b239d94fc06ef152cdbe9a;hb=87243efa5c792f72be0bcea2fdf0c4335d59c2ec;hp=92b691707f07c8504f2a75cf68e7aca1de829f2b;hpb=1f8fc31ddc1975a1f2e7c2fa8f7f611eab761680;p=bcachefs-tools-debian

diff --git a/rust-src/mount/src/main.rs b/rust-src/mount/src/main.rs
index 92b6917..66a60d9 100644
--- a/rust-src/mount/src/main.rs
+++ b/rust-src/mount/src/main.rs
@@ -1,3 +1,6 @@
+
+use clap::Parser;
+
 fn main() {
 	// convert existing log statements to tracing events
 	// tracing_log::LogTracer::init().expect("logtracer init failed!");
@@ -10,11 +13,9 @@ fn main() {
 }
 
 
-
 #[tracing_attributes::instrument("main")]
 pub fn main_inner() -> anyhow::Result<()> {
-	use structopt::StructOpt;
-	use bcachefs_mount::{Options, filesystem, key};
+	use bcachefs_mount::{Cli, filesystem, key};
 	unsafe {
 		libc::setvbuf(
 			filesystem::stdout,
@@ -24,9 +25,9 @@ pub fn main_inner() -> anyhow::Result<()> {
 		);
 		// libc::fflush(filesystem::stdout);
 	}
-	let opt = Options::from_args();
 
-	
+	let opt = Cli::parse();
+
 	tracing::trace!(?opt);
 
 	let fss = filesystem::probe_filesystems()?;