Radish alpha
h
Radicle Heartwood Protocol & Stack
Radicle
Git (anonymous pull)
Log in to clone via SSH
radicle-cli: Rewrite #[path=...] module decls
Matthias Beyer committed 8 months ago
commit 64e8a73e7b4423eb50084eeecdb4a5ce4ca807ad
parent f00d1d67432882bef11fc940601f071efe55c88d
8 files changed +65 -92
modified crates/radicle-cli/src/commands.rs
@@ -1,62 +1,64 @@
-
#[path = "commands/auth.rs"]
-
pub mod rad_auth;
-
#[path = "commands/block.rs"]
-
pub mod rad_block;
-
#[path = "commands/checkout.rs"]
-
pub mod rad_checkout;
-
#[path = "commands/clean.rs"]
-
pub mod rad_clean;
-
#[path = "commands/clone.rs"]
-
pub mod rad_clone;
-
#[path = "commands/cob.rs"]
-
pub mod rad_cob;
-
#[path = "commands/config.rs"]
-
pub mod rad_config;
-
#[path = "commands/debug.rs"]
-
pub mod rad_debug;
-
#[path = "commands/diff.rs"]
-
pub mod rad_diff;
-
#[path = "commands/follow.rs"]
-
pub mod rad_follow;
-
#[path = "commands/fork.rs"]
-
pub mod rad_fork;
-
#[path = "commands/help.rs"]
-
pub mod rad_help;
-
#[path = "commands/id.rs"]
-
pub mod rad_id;
-
#[path = "commands/inbox.rs"]
-
pub mod rad_inbox;
-
#[path = "commands/init.rs"]
-
pub mod rad_init;
-
#[path = "commands/inspect.rs"]
-
pub mod rad_inspect;
-
#[path = "commands/issue.rs"]
-
pub mod rad_issue;
-
#[path = "commands/ls.rs"]
-
pub mod rad_ls;
-
#[path = "commands/node.rs"]
-
pub mod rad_node;
-
#[path = "commands/patch.rs"]
-
pub mod rad_patch;
-
#[path = "commands/path.rs"]
-
pub mod rad_path;
-
#[path = "commands/publish.rs"]
-
pub mod rad_publish;
-
#[path = "commands/remote.rs"]
-
pub mod rad_remote;
-
#[path = "commands/seed.rs"]
-
pub mod rad_seed;
+
pub mod auth;
+
pub mod block;
+
pub mod checkout;
+
pub mod clean;
+
pub mod clone;
+
pub mod cob;
+
pub mod config;
+
pub mod debug;
+
pub mod diff;
+
pub mod follow;
+
pub mod fork;
+
pub mod help;
+
pub mod id;
+
pub mod inbox;
+
pub mod init;
+
pub mod inspect;
+
pub mod issue;
+
pub mod ls;
+
pub mod node;
+
pub mod patch;
+
pub mod path;
+
pub mod publish;
+
pub mod remote;
+
pub mod seed;
+
pub mod stats;
+
pub mod sync;
+
pub mod unblock;
+
pub mod unfollow;
+
pub mod unseed;
+
pub mod watch;
+

#[path = "commands/self.rs"]
pub mod rad_self;
-
#[path = "commands/stats.rs"]
-
pub mod rad_stats;
-
#[path = "commands/sync.rs"]
-
pub mod rad_sync;
-
#[path = "commands/unblock.rs"]
-
pub mod rad_unblock;
-
#[path = "commands/unfollow.rs"]
-
pub mod rad_unfollow;
-
#[path = "commands/unseed.rs"]
-
pub mod rad_unseed;
-
#[path = "commands/watch.rs"]
-
pub mod rad_watch;
+

+
pub use auth as rad_auth;
+
pub use block as rad_block;
+
pub use checkout as rad_checkout;
+
pub use clean as rad_clean;
+
pub use clone as rad_clone;
+
pub use cob as rad_cob;
+
pub use config as rad_config;
+
pub use debug as rad_debug;
+
pub use diff as rad_diff;
+
pub use follow as rad_follow;
+
pub use fork as rad_fork;
+
pub use help as rad_help;
+
pub use id as rad_id;
+
pub use inbox as rad_inbox;
+
pub use init as rad_init;
+
pub use inspect as rad_inspect;
+
pub use issue as rad_issue;
+
pub use ls as rad_ls;
+
pub use node as rad_node;
+
pub use patch as rad_patch;
+
pub use path as rad_path;
+
pub use publish as rad_publish;
+
pub use remote as rad_remote;
+
pub use seed as rad_seed;
+
pub use stats as rad_stats;
+
pub use sync as rad_sync;
+
pub use unblock as rad_unblock;
+
pub use unfollow as rad_unfollow;
+
pub use unseed as rad_unseed;
+
pub use watch as rad_watch;
modified crates/radicle-cli/src/commands/issue.rs
@@ -1,4 +1,3 @@
-
#[path = "issue/cache.rs"]
mod cache;

use std::collections::BTreeSet;
modified crates/radicle-cli/src/commands/node.rs
@@ -16,13 +16,10 @@ use crate::terminal as term;
use crate::terminal::args::{Args, Error, Help};
use crate::terminal::Element as _;

-
#[path = "node/commands.rs"]
mod commands;
-
#[path = "node/control.rs"]
pub mod control;
-
#[path = "node/events.rs"]
mod events;
-
#[path = "node/routing.rs"]
+
mod logs;
pub mod routing;

pub const HELP: Help = Help {
modified crates/radicle-cli/src/commands/node/control.rs
@@ -1,6 +1,3 @@
-
mod logs;
-
use logs::{LogRotatorFileSystem, Rotated};
-

use std::collections::HashMap;
use std::ffi::OsString;
use std::fs::File;
@@ -16,6 +13,7 @@ use radicle::profile::env::RAD_PASSPHRASE;
use radicle::Node;
use radicle::{profile, Profile};

+
use crate::commands::node::logs::{LogRotatorFileSystem, Rotated};
use crate::terminal as term;
use crate::terminal::Element as _;

modified crates/radicle-cli/src/commands/patch.rs
@@ -1,36 +1,19 @@
-
#[path = "patch/archive.rs"]
mod archive;
-
#[path = "patch/assign.rs"]
mod assign;
-
#[path = "patch/cache.rs"]
mod cache;
-
#[path = "patch/checkout.rs"]
mod checkout;
-
#[path = "patch/comment.rs"]
mod comment;
-
#[path = "patch/delete.rs"]
mod delete;
-
#[path = "patch/diff.rs"]
mod diff;
-
#[path = "patch/edit.rs"]
mod edit;
-
#[path = "patch/label.rs"]
mod label;
-
#[path = "patch/list.rs"]
mod list;
-
#[path = "patch/react.rs"]
mod react;
-
#[path = "patch/ready.rs"]
mod ready;
-
#[path = "patch/redact.rs"]
mod redact;
-
#[path = "patch/resolve.rs"]
mod resolve;
-
#[path = "patch/review.rs"]
mod review;
-
#[path = "patch/show.rs"]
mod show;
-
#[path = "patch/update.rs"]
mod update;

use std::collections::BTreeSet;
modified crates/radicle-cli/src/commands/patch/comment.rs
@@ -1,8 +1,5 @@
-
#[path = "comment/edit.rs"]
pub mod edit;
-
#[path = "comment/react.rs"]
pub mod react;
-
#[path = "comment/redact.rs"]
pub mod redact;

use super::*;
modified crates/radicle-cli/src/commands/patch/review.rs
@@ -1,4 +1,3 @@
-
#[path = "review/builder.rs"]
mod builder;

use anyhow::{anyhow, Context};
modified crates/radicle-cli/src/commands/remote.rs
@@ -1,9 +1,7 @@
//! Remote Command implementation
-
#[path = "remote/add.rs"]
+

pub mod add;
-
#[path = "remote/list.rs"]
pub mod list;
-
#[path = "remote/rm.rs"]
pub mod rm;

use std::ffi::OsString;