Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2025-01-05 17:59:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5093 from sylvestre/fix-man-coreutils

Browse source 
Improve the coreutils manpage
This commit is contained in:
Daniel Hofstetter 2023-07-18 15:13:39 +02:00 committed by GitHub
commit cf29f3f452
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.rs
View file

@ -38,14 +38,14 @@ pub fn main() {
let mut mf = File::create(Path::new(&out_dir).join("uutils_map.rs")).unwrap(); let mut mf = File::create(Path::new(&out_dir).join("uutils_map.rs")).unwrap();
mf.write_all( mf.write_all(
"type UtilityMap<T> = phf::Map<&'static str, (fn(T) -> i32, fn() -> Command)>;\n\ "type UtilityMap<T> = phf::OrderedMap<&'static str, (fn(T) -> i32, fn() -> Command)>;\n\
\n\ \n\
fn util_map<T: uucore::Args>() -> UtilityMap<T> {\n" fn util_map<T: uucore::Args>() -> UtilityMap<T> {\n"
.as_bytes(), .as_bytes(),
) )
.unwrap(); .unwrap();
let mut phf_map = phf_codegen::Map::<&str>::new(); let mut phf_map = phf_codegen::OrderedMap::<&str>::new();
for krate in &crates { for krate in &crates {
let map_value = format!("({krate}::uumain, {krate}::uu_app)"); let map_value = format!("({krate}::uumain, {krate}::uu_app)");
match krate.as_ref() { match krate.as_ref() {

11
src/bin/coreutils.rs
View file

@ -212,8 +212,15 @@ fn gen_manpage<T: uucore::Args>(
fn gen_coreutils_app<T: uucore::Args>(util_map: &UtilityMap<T>) -> Command { fn gen_coreutils_app<T: uucore::Args>(util_map: &UtilityMap<T>) -> Command {
let mut command = Command::new("coreutils"); let mut command = Command::new("coreutils");
for (_, (_, sub_app)) in util_map { for (name, (_, sub_app)) in util_map {
command = command.subcommand(sub_app()); // Recreate a small subcommand with only the relevant info
// (name & short description)
let about = sub_app()
.get_about()
.expect("Could not get the 'about'")
.to_string();
let sub_app = Command::new(name).about(about);
command = command.subcommand(sub_app);
} }
command command
} }