diff options
author | Thomas Bertschinger <tahbertschinger@gmail.com> | 2024-01-15 23:41:02 -0700 |
---|---|---|
committer | Kent Overstreet <kent.overstreet@linux.dev> | 2024-01-16 01:47:05 -0500 |
commit | f5baaf48e3e82b1caf9f5cd1207d4d6feba3a2e5 (patch) | |
tree | 59f7b0e4667df7a9d3d5a45725f2aaab3e79b4c5 /rust-src/src/commands/mod.rs | |
parent | fb35dbfdc5a9446fbb856dae5542b23963e28b89 (diff) |
move Rust sources to top level, C sources into c_src
This moves the Rust sources out of rust_src/ and into the top level.
Running the bcachefs executable out of the development tree is now:
$ ./target/release/bcachefs command
or
$ cargo run --profile release -- command
instead of "./bcachefs command".
Building and installing is still:
$ make && make install
Signed-off-by: Thomas Bertschinger <tahbertschinger@gmail.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'rust-src/src/commands/mod.rs')
-rw-r--r-- | rust-src/src/commands/mod.rs | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/rust-src/src/commands/mod.rs b/rust-src/src/commands/mod.rs deleted file mode 100644 index e05a0848..00000000 --- a/rust-src/src/commands/mod.rs +++ /dev/null @@ -1,31 +0,0 @@ -use clap::Subcommand; - -pub mod logger; -pub mod cmd_mount; -pub mod cmd_list; -pub mod cmd_completions; - -#[derive(clap::Parser, Debug)] -#[command(name = "bcachefs")] -pub struct Cli { - #[command(subcommand)] - subcommands: Subcommands, -} - -#[derive(Subcommand, Debug)] -enum Subcommands { - List(cmd_list::Cli), - Mount(cmd_mount::Cli), - Completions(cmd_completions::Cli), -} - -#[macro_export] -macro_rules! c_str { - ($lit:expr) => { - unsafe { - std::ffi::CStr::from_ptr(concat!($lit, "\0").as_ptr() as *const std::os::raw::c_char) - .to_bytes_with_nul() - .as_ptr() as *const std::os::raw::c_char - } - }; -} |