From e3cb5a111de1a1ba1d64a74044921beb9d8e4385 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 1 Jun 2023 20:38:55 +0200 Subject: [PATCH] Rename help_parser => uuhelp_parser --- Cargo.lock | 12 ++++++------ Cargo.toml | 4 ++-- src/bin/uudoc.rs | 6 +++--- src/uucore_procs/Cargo.toml | 2 +- src/uucore_procs/src/lib.rs | 6 +++--- src/{help_parser => uuhelp_parser}/Cargo.toml | 2 +- src/{help_parser => uuhelp_parser}/src/lib.rs | 0 7 files changed, 16 insertions(+), 16 deletions(-) rename src/{help_parser => uuhelp_parser}/Cargo.toml (86%) rename src/{help_parser => uuhelp_parser}/src/lib.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index f45951917..5048b4aa0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -403,7 +403,6 @@ dependencies = [ "conv", "filetime", "glob", - "help_parser", "hex-literal", "is-terminal", "libc", @@ -529,6 +528,7 @@ dependencies = [ "uu_whoami", "uu_yes", "uucore", + "uuhelp_parser", "walkdir", "zip", ] @@ -1107,10 +1107,6 @@ dependencies = [ "ahash", ] -[[package]] -name = "help_parser" -version = "0.0.18" - [[package]] name = "hermit-abi" version = "0.1.19" @@ -3430,11 +3426,15 @@ dependencies = [ name = "uucore_procs" version = "0.0.19" dependencies = [ - "help_parser", "proc-macro2", "quote", + "uuhelp_parser", ] +[[package]] +name = "uuhelp_parser" +version = "0.0.18" + [[package]] name = "uuid" version = "1.2.2" diff --git a/Cargo.toml b/Cargo.toml index c1b1c3dae..7e851363f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,7 +31,7 @@ windows = [ "feat_os_windows" ] nightly = [] test_unimplemented = [] # * only build `uudoc` when `--feature uudoc` is activated -uudoc = ["zip", "dep:help_parser"] +uudoc = ["zip", "dep:uuhelp_parser"] ## features # "feat_acl" == enable support for ACLs (access control lists; by using`--features feat_acl`) # NOTE: @@ -358,7 +358,7 @@ selinux = { workspace=true, optional = true } textwrap = { workspace=true } zip = { workspace=true, optional = true } -help_parser = { path="src/help_parser", optional = true } +uuhelp_parser = { path="src/uuhelp_parser", optional = true } # * uutils uu_test = { optional=true, version="0.0.19", package="uu_test", path="src/uu/test" } diff --git a/src/bin/uudoc.rs b/src/bin/uudoc.rs index b7a2ce581..e37925825 100644 --- a/src/bin/uudoc.rs +++ b/src/bin/uudoc.rs @@ -178,7 +178,7 @@ impl<'a, 'b> MDWriter<'a, 'b> { fn usage(&mut self) -> io::Result<()> { if let Some(markdown) = &self.markdown { - let usage = help_parser::parse_usage(markdown); + let usage = uuhelp_parser::parse_usage(markdown); let usage = usage.replace("{}", self.name); writeln!(self.w, "\n```")?; @@ -191,7 +191,7 @@ impl<'a, 'b> MDWriter<'a, 'b> { fn about(&mut self) -> io::Result<()> { if let Some(markdown) = &self.markdown { - writeln!(self.w, "{}", help_parser::parse_about(markdown)) + writeln!(self.w, "{}", uuhelp_parser::parse_about(markdown)) } else { Ok(()) } @@ -199,7 +199,7 @@ impl<'a, 'b> MDWriter<'a, 'b> { fn after_help(&mut self) -> io::Result<()> { if let Some(markdown) = &self.markdown { - if let Some(after_help) = help_parser::parse_section("after help", markdown) { + if let Some(after_help) = uuhelp_parser::parse_section("after help", markdown) { return writeln!(self.w, "\n\n{after_help}"); } } diff --git a/src/uucore_procs/Cargo.toml b/src/uucore_procs/Cargo.toml index d2d3102e3..0ef44fbae 100644 --- a/src/uucore_procs/Cargo.toml +++ b/src/uucore_procs/Cargo.toml @@ -18,4 +18,4 @@ proc-macro = true [dependencies] proc-macro2 = "1.0" quote = "1.0" -help_parser = { path="../help_parser", version="0.0.18" } +uuhelp_parser = { path="../uuhelp_parser", version="0.0.18" } diff --git a/src/uucore_procs/src/lib.rs b/src/uucore_procs/src/lib.rs index 4bc2521b8..ba32f649b 100644 --- a/src/uucore_procs/src/lib.rs +++ b/src/uucore_procs/src/lib.rs @@ -58,7 +58,7 @@ fn render_markdown(s: &str) -> String { pub fn help_about(input: TokenStream) -> TokenStream { let input: Vec = input.into_iter().collect(); let filename = get_argument(&input, 0, "filename"); - let text: String = help_parser::parse_about(&read_help(&filename)); + let text: String = uuhelp_parser::parse_about(&read_help(&filename)); TokenTree::Literal(Literal::string(&text)).into() } @@ -72,7 +72,7 @@ pub fn help_about(input: TokenStream) -> TokenStream { pub fn help_usage(input: TokenStream) -> TokenStream { let input: Vec = input.into_iter().collect(); let filename = get_argument(&input, 0, "filename"); - let text: String = help_parser::parse_usage(&read_help(&filename)); + let text: String = uuhelp_parser::parse_usage(&read_help(&filename)); TokenTree::Literal(Literal::string(&text)).into() } @@ -106,7 +106,7 @@ pub fn help_section(input: TokenStream) -> TokenStream { let section = get_argument(&input, 0, "section"); let filename = get_argument(&input, 1, "filename"); - if let Some(text) = help_parser::parse_section(§ion, &read_help(&filename)) { + if let Some(text) = uuhelp_parser::parse_section(§ion, &read_help(&filename)) { let rendered = render_markdown(&text); TokenTree::Literal(Literal::string(&rendered)).into() } else { diff --git a/src/help_parser/Cargo.toml b/src/uuhelp_parser/Cargo.toml similarity index 86% rename from src/help_parser/Cargo.toml rename to src/uuhelp_parser/Cargo.toml index 2c4080c81..9f4c0d68d 100644 --- a/src/help_parser/Cargo.toml +++ b/src/uuhelp_parser/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "help_parser" +name = "uuhelp_parser" version = "0.0.18" edition = "2021" license = "MIT" diff --git a/src/help_parser/src/lib.rs b/src/uuhelp_parser/src/lib.rs similarity index 100% rename from src/help_parser/src/lib.rs rename to src/uuhelp_parser/src/lib.rs