uutils/uutils-args
0
0
Fork 0
mirror of https://github.com/uutils/uutils-args.git synced 2026-06-10 16:13:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

make 'complete' available to procmacro by conversion to module

Browse Source
This commit is contained in:
Ben Wiederhake
2025-04-16 02:12:55 +02:00
parent 48aae19444
commit bbb193d387
14 changed files with 38 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.toml
+4 -4
View File
@@ -10,13 +10,13 @@ repository = "https://github.com/uutils/uutils-args"
readme = "README.md"
[dependencies]
uutils-args-derive = { version = "0.1.0", path = "derive" }
uutils-args-complete = { version = "0.1.0", path = "complete" }
strsim = "0.11.1"
lexopt = "0.3.0"
roff = "0.2.1"
strsim = "0.11.1"
uutils-args-derive = { version = "0.1.0", path = "derive" }
[features]
parse-is-complete = []
[workspace]
members = ["derive", "complete"]
members = ["derive"]
complete/Cargo.toml
-11
View File
@@ -1,11 +0,0 @@
[package]
name = "uutils-args-complete"
version = "0.1.0"
edition = "2024"
authors = ["Terts Diepraam"]
license = "MIT"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
roff = "0.2.1"
complete/LICENSE
-1
View File
@@ -1 +0,0 @@
../LICENSE
derive/src/complete.rs
+18 -10
View File
@@ -49,11 +49,15 @@ pub fn complete(args: &[Argument], file: &Option<String>) -> TokenStream {
.map(|Flag { flag, value }| {
let flag = flag.to_string();
let value = match value {
Value::No => quote!(::uutils_args_complete::Value::No),
Value::Optional(name) => quote!(::uutils_args_complete::Value::Optional(#name)),
Value::Required(name) => quote!(::uutils_args_complete::Value::Required(#name)),
Value::No => quote!(::uutils_args::complete::Value::No),
Value::Optional(name) => {
quote!(::uutils_args::complete::Value::Optional(#name))
}
Value::Required(name) => {
quote!(::uutils_args::complete::Value::Required(#name))
}
};
quote!(::uutils_args_complete::Flag {
quote!(::uutils_args::complete::Flag {
flag: #flag,
value: #value
})
@@ -64,11 +68,15 @@ pub fn complete(args: &[Argument], file: &Option<String>) -> TokenStream {
.iter()
.map(|Flag { flag, value }| {
let value = match value {
Value::No => quote!(::uutils_args_complete::Value::No),
Value::Optional(name) => quote!(::uutils_args_complete::Value::Optional(#name)),
Value::Required(name) => quote!(::uutils_args_complete::Value::Required(#name)),
Value::No => quote!(::uutils_args::complete::Value::No),
Value::Optional(name) => {
quote!(::uutils_args::complete::Value::Optional(#name))
}
Value::Required(name) => {
quote!(::uutils_args::complete::Value::Required(#name))
}
};
quote!(::uutils_args_complete::Flag {
quote!(::uutils_args::complete::Flag {
flag: #flag,
value: #value
})
@@ -81,7 +89,7 @@ pub fn complete(args: &[Argument], file: &Option<String>) -> TokenStream {
};
arg_specs.push(quote!(
::uutils_args_complete::Arg {
::uutils_args::complete::Arg {
short: vec![#(#short),*],
long: vec![#(#long),*],
help: #help,
@@ -90,7 +98,7 @@ pub fn complete(args: &[Argument], file: &Option<String>) -> TokenStream {
))
}
quote!(::uutils_args_complete::Command {
quote!(::uutils_args::complete::Command {
name: option_env!("CARGO_BIN_NAME").unwrap_or(env!("CARGO_PKG_NAME")),
summary: #summary,
after_options: #after_options,
derive/src/lib.rs
+3 -3
View File
@@ -117,7 +117,7 @@ pub fn arguments(input: TokenStream) -> TokenStream {
#version_string
}
fn complete() -> ::uutils_args_complete::Command<'static> {
fn complete() -> ::uutils_args::complete::Command<'static> {
use ::uutils_args::Value;
#complete_command
}
@@ -212,9 +212,9 @@ pub fn value(input: TokenStream) -> TokenStream {
})
}
fn value_hint() -> ::uutils_args_complete::ValueHint {
fn value_hint() -> ::uutils_args::complete::ValueHint {
let keys: [&str; #keys_len] = [#(#all_keys),*];
::uutils_args_complete::ValueHint::Strings(
::uutils_args::complete::ValueHint::Strings(
keys
.into_iter()
.map(ToString::to_string)
complete/src/bash.rs → src/complete/bash.rs
+2 -2
View File
@@ -1,7 +1,7 @@
// For the full copyright and license information, please view the LICENSE
// file that was distributed with this source code.
use crate::{Command, Flag};
use crate::complete::{Command, Flag};
/// Create completion script for `bash`
///
@@ -35,7 +35,7 @@ pub fn render(c: &Command) -> String {
#[cfg(test)]
mod test {
use super::render;
use crate::{Arg, Command, Flag, Value};
use crate::complete::{Arg, Command, Flag, Value};
#[test]
fn simple() {
complete/src/fish.rs → src/complete/fish.rs
+2 -2
View File
@@ -1,7 +1,7 @@
// For the full copyright and license information, please view the LICENSE
// file that was distributed with this source code.
use crate::{Command, Flag, ValueHint};
use crate::complete::{Command, Flag, ValueHint};
/// Create completion script for `fish`
///
@@ -45,7 +45,7 @@ fn render_value_hint(value: &ValueHint) -> String {
#[cfg(test)]
mod test {
use super::render;
use crate::{Arg, Command, Flag, Value, ValueHint};
use crate::complete::{Arg, Command, Flag, Value, ValueHint};
#[test]
fn short() {
complete/src/man.rs → src/complete/man.rs
+1 -1
View File
@@ -1,7 +1,7 @@
// For the full copyright and license information, please view the LICENSE
// file that was distributed with this source code.
use crate::{Command, Flag, Value};
use crate::complete::{Command, Flag, Value};
use roff::{Roff, bold, italic, roman};
pub fn render(c: &Command) -> String {
complete/src/md.rs → src/complete/md.rs
+1 -1
View File
@@ -1,7 +1,7 @@
// For the full copyright and license information, please view the LICENSE
// file that was distributed with this source code.
use crate::{Command, Flag, Value};
use crate::complete::{Command, Flag, Value};
/// Render command to a markdown file for mdbook
pub fn render(c: &Command) -> String {
complete/src/lib.rs → src/complete/mod.rs
View File
complete/src/nu.rs → src/complete/nu.rs
+1 -1
View File
@@ -1,7 +1,7 @@
// For the full copyright and license information, please view the LICENSE
// file that was distributed with this source code.
use crate::{Arg, Command, Flag, Value, ValueHint};
use crate::complete::{Arg, Command, Flag, Value, ValueHint};
use std::fmt::Write;
/// Create completion script for `nushell`
complete/src/zsh.rs → src/complete/zsh.rs
+1 -1
View File
@@ -1,7 +1,7 @@
// For the full copyright and license information, please view the LICENSE
// file that was distributed with this source code.
use crate::{Arg, Command, Flag, Value, ValueHint};
use crate::complete::{Arg, Command, Flag, Value, ValueHint};
/// Create completion script for `zsh`
pub fn render(c: &Command) -> String {
src/lib.rs
+3 -2
View File
@@ -9,6 +9,7 @@
//!
#![doc = include_str!("../README.md")]
pub mod complete;
mod error;
pub mod internal;
pub mod positional;
@@ -103,7 +104,7 @@ pub trait Arguments: Sized {
Ok(())
}
fn complete() -> uutils_args_complete::Command<'static>;
fn complete() -> complete::Command<'static>;
}
/// An iterator over arguments.
@@ -197,7 +198,7 @@ pub trait Options<Arg: Arguments>: Sized {
}
fn complete(shell: &str) -> String {
uutils_args_complete::render(&Arg::complete(), shell)
complete::render(&Arg::complete(), shell)
}
}
src/value.rs
+2 -2
View File
@@ -1,12 +1,12 @@
// For the full copyright and license information, please view the LICENSE
// file that was distributed with this source code.
use crate::complete::ValueHint;
use crate::error::{Error, ErrorKind};
use std::{
ffi::{OsStr, OsString},
path::PathBuf,
};
use uutils_args_complete::ValueHint;
pub type ValueResult<T> = Result<T, Box<dyn std::error::Error + Send + Sync + 'static>>;
@@ -95,7 +95,7 @@ where
Ok(Some(T::from_value(value)?))
}
fn value_hint() -> uutils_args_complete::ValueHint {
fn value_hint() -> ValueHint {
T::value_hint()
}
}