From bdee636dc5c5347ce732425618d191ef6e45a32a Mon Sep 17 00:00:00 2001 From: sylvestre Date: Fri, 31 Mar 2023 02:41:06 +0000 Subject: [PATCH] deploy: f0e8d44e6e64ee3354f95864c0a25b74cf1c1151 --- dev/src/uu_pr/pr.rs.html | 52 ++----------------- dev/src/uu_uniq/uniq.rs.html | 18 ++----- dev/uu_pr/fn.uu_app.html | 2 +- dev/uu_pr/fn.uumain.html | 2 +- dev/uu_pr/index.html | 2 +- dev/uu_uniq/fn.uu_app.html | 2 +- dev/uu_uniq/fn.uumain.html | 2 +- dev/uu_uniq/index.html | 2 +- dev/uu_uniq/options/index.html | 2 +- dev/uu_uniq/options/static.ALL_REPEATED.html | 2 +- dev/uu_uniq/options/static.CHECK_CHARS.html | 2 +- dev/uu_uniq/options/static.COUNT.html | 2 +- dev/uu_uniq/options/static.GROUP.html | 2 +- dev/uu_uniq/options/static.IGNORE_CASE.html | 2 +- dev/uu_uniq/options/static.REPEATED.html | 2 +- dev/uu_uniq/options/static.SKIP_CHARS.html | 2 +- dev/uu_uniq/options/static.SKIP_FIELDS.html | 2 +- dev/uu_uniq/options/static.UNIQUE.html | 2 +- .../options/static.ZERO_TERMINATED.html | 2 +- 19 files changed, 27 insertions(+), 77 deletions(-) diff --git a/dev/src/uu_pr/pr.rs.html b/dev/src/uu_pr/pr.rs.html index cc3624896..31ef2afad 100644 --- a/dev/src/uu_pr/pr.rs.html +++ b/dev/src/uu_pr/pr.rs.html @@ -1268,27 +1268,6 @@ 1268 1269 1270 -1271 -1272 -1273 -1274 -1275 -1276 -1277 -1278 -1279 -1280 -1281 -1282 -1283 -1284 -1285 -1286 -1287 -1288 -1289 -1290 -1291 
// This file is part of the uutils coreutils package.
 //
 // For the full copyright and license information, please view the LICENSE file
@@ -1312,33 +1291,11 @@
 use quick_error::quick_error;
 use uucore::display::Quotable;
 use uucore::error::UResult;
+use uucore::{format_usage, help_about, help_section, help_usage};
 
-const ABOUT: &str =
-    "Write content of given file or standard input to standard output with pagination filter";
-const AFTER_HELP: &str =
-    "    +PAGE\n            Begin output at page number page of the formatted input.
-    -COLUMN\n            Produce multi-column output. See --column
-
-The pr utility is a printing and pagination filter
-for text files.  When multiple input files are specified,
-each is read, formatted, and written to standard
-output.  By default, the input is separated
-into 66-line pages, each with
-
-o   A 5-line header with the page number, date,
-    time, and the pathname of the file.
-
-o   A 5-line trailer consisting of blank lines.
-
-If standard output is associated with a terminal,
-diagnostic messages are suppressed until the pr
-utility has completed processing.
-
-When multiple column output is specified, text columns
-are of equal width.  By default text columns
-are separated by at least one <blank>.  Input lines
-that do not fit into a text column are truncated.
-Lines are not truncated under single column output.";
+const ABOUT: &str = help_about!("pr.md");
+const USAGE: &str = help_usage!("pr.md");
+const AFTER_HELP: &str = help_section!("after help", "pr.md");
 const TAB: char = '\t';
 const LINES_PER_PAGE: usize = 66;
 const LINES_PER_PAGE_FOR_FORM_FEED: usize = 63;
@@ -1486,6 +1443,7 @@ Lines are not truncated under single column output.";
         .version(crate_version!())
         .about(ABOUT)
         .after_help(AFTER_HELP)
+        .override_usage(format_usage(USAGE))
         .infer_long_args(true)
         .args_override_self(true)
         .disable_help_flag(true)
diff --git a/dev/src/uu_uniq/uniq.rs.html b/dev/src/uu_uniq/uniq.rs.html
index 24121e4aa..a48e6ccf4 100644
--- a/dev/src/uu_uniq/uniq.rs.html
+++ b/dev/src/uu_uniq/uniq.rs.html
@@ -435,10 +435,6 @@
 435
 436
 437
-438
-439
-440
-441
 
//  * This file is part of the uutils coreutils package.
 //  *
 //  * (c) Chirag B Jadwani <chirag.jadwani@gmail.com>
@@ -453,15 +449,11 @@
 use std::str::FromStr;
 use uucore::display::Quotable;
 use uucore::error::{FromIo, UResult, USimpleError, UUsageError};
-use uucore::format_usage;
+use uucore::{format_usage, help_about, help_section, help_usage};
 
-const ABOUT: &str = "Report or omit repeated lines.";
-const USAGE: &str = "{} [OPTION]... [INPUT [OUTPUT]]...";
-const LONG_USAGE: &str = "\
-    Filter adjacent matching lines from INPUT (or standard input),\n\
-    writing to OUTPUT (or standard output).\n\n\
-    Note: 'uniq' does not detect repeated lines unless they are adjacent.\n\
-    You may want to sort the input first, or use 'sort -u' without 'uniq'.";
+const ABOUT: &str = help_about!("uniq.md");
+const USAGE: &str = help_usage!("uniq.md");
+const AFTER_HELP: &str = help_section!("after help", "uniq.md");
 
 pub mod options {
     pub static ALL_REPEATED: &str = "all-repeated";
@@ -688,7 +680,7 @@
 
 #[uucore::main]
 pub fn uumain(args: impl uucore::Args) -> UResult<()> {
-    let matches = uu_app().after_help(LONG_USAGE).try_get_matches_from(args)?;
+    let matches = uu_app().after_help(AFTER_HELP).try_get_matches_from(args)?;
 
     let files: Vec<String> = matches
         .get_many::<String>(ARG_FILES)
diff --git a/dev/uu_pr/fn.uu_app.html b/dev/uu_pr/fn.uu_app.html
index 835e9900a..22ccaedc6 100644
--- a/dev/uu_pr/fn.uu_app.html
+++ b/dev/uu_pr/fn.uu_app.html
@@ -1 +1 @@
-uu_app in uu_pr - Rust
Function uu_pr::uu_app
source · 
pub fn uu_app() -> Command

\ No newline at end of file
+uu_app in uu_pr - Rust
Function uu_pr::uu_app
source · 
pub fn uu_app() -> Command

\ No newline at end of file
diff --git a/dev/uu_pr/fn.uumain.html b/dev/uu_pr/fn.uumain.html
index dd8228ea6..1661909c5 100644
--- a/dev/uu_pr/fn.uumain.html
+++ b/dev/uu_pr/fn.uumain.html
@@ -1 +1 @@
-uumain in uu_pr - Rust
Function uu_pr::uumain
source · 
pub fn uumain(args: impl Args) -> i32

\ No newline at end of file
+uumain in uu_pr - Rust
Function uu_pr::uumain
source · 
pub fn uumain(args: impl Args) -> i32

\ No newline at end of file
diff --git a/dev/uu_pr/index.html b/dev/uu_pr/index.html
index 302b7c4f3..ecffac17f 100644
--- a/dev/uu_pr/index.html
+++ b/dev/uu_pr/index.html
@@ -1 +1 @@
-uu_pr - Rust
Crate uu_pr
source · 
Functions
uu_app
uumain

\ No newline at end of file
+uu_pr - Rust
Crate uu_pr
source · 
Functions
uu_app
uumain

\ No newline at end of file
diff --git a/dev/uu_uniq/fn.uu_app.html b/dev/uu_uniq/fn.uu_app.html
index 82e3b8912..ed86eb7e1 100644
--- a/dev/uu_uniq/fn.uu_app.html
+++ b/dev/uu_uniq/fn.uu_app.html
@@ -1 +1 @@
-uu_app in uu_uniq - Rust
Function uu_uniq::uu_app
source · 
pub fn uu_app() -> Command

\ No newline at end of file
+uu_app in uu_uniq - Rust
Function uu_uniq::uu_app
source · 
pub fn uu_app() -> Command

\ No newline at end of file
diff --git a/dev/uu_uniq/fn.uumain.html b/dev/uu_uniq/fn.uumain.html
index e39b686ef..1d2d3eb71 100644
--- a/dev/uu_uniq/fn.uumain.html
+++ b/dev/uu_uniq/fn.uumain.html
@@ -1 +1 @@
-uumain in uu_uniq - Rust
Function uu_uniq::uumain
source · 
pub fn uumain(args: impl Args) -> i32

\ No newline at end of file
+uumain in uu_uniq - Rust
Function uu_uniq::uumain
source · 
pub fn uumain(args: impl Args) -> i32

\ No newline at end of file
diff --git a/dev/uu_uniq/index.html b/dev/uu_uniq/index.html
index 2fb9f0907..6e127ce80 100644
--- a/dev/uu_uniq/index.html
+++ b/dev/uu_uniq/index.html
@@ -1 +1 @@
-uu_uniq - Rust
Crate uu_uniq
source · 
Modules
options
Functions
uu_app
uumain

\ No newline at end of file
+uu_uniq - Rust
Crate uu_uniq
source · 
Modules
options
Functions
uu_app
uumain

\ No newline at end of file
diff --git a/dev/uu_uniq/options/index.html b/dev/uu_uniq/options/index.html
index a30651313..fc3b52646 100644
--- a/dev/uu_uniq/options/index.html
+++ b/dev/uu_uniq/options/index.html
@@ -1 +1 @@
-uu_uniq::options - Rust
Module uu_uniq::options
source · 
Statics
ALL_REPEATED
CHECK_CHARS
COUNT
GROUP
IGNORE_CASE
REPEATED
SKIP_CHARS
SKIP_FIELDS
UNIQUE
ZERO_TERMINATED

\ No newline at end of file
+uu_uniq::options - Rust
Module uu_uniq::options
source · 
Statics
ALL_REPEATED
CHECK_CHARS
COUNT
GROUP
IGNORE_CASE
REPEATED
SKIP_CHARS
SKIP_FIELDS
UNIQUE
ZERO_TERMINATED

\ No newline at end of file
diff --git a/dev/uu_uniq/options/static.ALL_REPEATED.html b/dev/uu_uniq/options/static.ALL_REPEATED.html
index 4f99040da..d53023276 100644
--- a/dev/uu_uniq/options/static.ALL_REPEATED.html
+++ b/dev/uu_uniq/options/static.ALL_REPEATED.html
@@ -1 +1 @@
-ALL_REPEATED in uu_uniq::options - Rust
Static uu_uniq::options::ALL_REPEATED
source · 
pub static ALL_REPEATED: &str

\ No newline at end of file
+ALL_REPEATED in uu_uniq::options - Rust
Static uu_uniq::options::ALL_REPEATED
source · 
pub static ALL_REPEATED: &str

\ No newline at end of file
diff --git a/dev/uu_uniq/options/static.CHECK_CHARS.html b/dev/uu_uniq/options/static.CHECK_CHARS.html
index 02a016e6f..e10890819 100644
--- a/dev/uu_uniq/options/static.CHECK_CHARS.html
+++ b/dev/uu_uniq/options/static.CHECK_CHARS.html
@@ -1 +1 @@
-CHECK_CHARS in uu_uniq::options - Rust
Static uu_uniq::options::CHECK_CHARS
source · 
pub static CHECK_CHARS: &str

\ No newline at end of file
+CHECK_CHARS in uu_uniq::options - Rust
Static uu_uniq::options::CHECK_CHARS
source · 
pub static CHECK_CHARS: &str

\ No newline at end of file
diff --git a/dev/uu_uniq/options/static.COUNT.html b/dev/uu_uniq/options/static.COUNT.html
index 157bfec74..cb31fd575 100644
--- a/dev/uu_uniq/options/static.COUNT.html
+++ b/dev/uu_uniq/options/static.COUNT.html
@@ -1 +1 @@
-COUNT in uu_uniq::options - Rust
Static uu_uniq::options::COUNT
source · 
pub static COUNT: &str

\ No newline at end of file
+COUNT in uu_uniq::options - Rust
Static uu_uniq::options::COUNT
source · 
pub static COUNT: &str

\ No newline at end of file
diff --git a/dev/uu_uniq/options/static.GROUP.html b/dev/uu_uniq/options/static.GROUP.html
index 89648f5c6..63a19c6ed 100644
--- a/dev/uu_uniq/options/static.GROUP.html
+++ b/dev/uu_uniq/options/static.GROUP.html
@@ -1 +1 @@
-GROUP in uu_uniq::options - Rust
Static uu_uniq::options::GROUP
source · 
pub static GROUP: &str

\ No newline at end of file
+GROUP in uu_uniq::options - Rust
Static uu_uniq::options::GROUP
source · 
pub static GROUP: &str

\ No newline at end of file
diff --git a/dev/uu_uniq/options/static.IGNORE_CASE.html b/dev/uu_uniq/options/static.IGNORE_CASE.html
index 85b32ee04..154735257 100644
--- a/dev/uu_uniq/options/static.IGNORE_CASE.html
+++ b/dev/uu_uniq/options/static.IGNORE_CASE.html
@@ -1 +1 @@
-IGNORE_CASE in uu_uniq::options - Rust
Static uu_uniq::options::IGNORE_CASE
source · 
pub static IGNORE_CASE: &str

\ No newline at end of file
+IGNORE_CASE in uu_uniq::options - Rust
Static uu_uniq::options::IGNORE_CASE
source · 
pub static IGNORE_CASE: &str

\ No newline at end of file
diff --git a/dev/uu_uniq/options/static.REPEATED.html b/dev/uu_uniq/options/static.REPEATED.html
index f26b93535..2d18a2733 100644
--- a/dev/uu_uniq/options/static.REPEATED.html
+++ b/dev/uu_uniq/options/static.REPEATED.html
@@ -1 +1 @@
-REPEATED in uu_uniq::options - Rust
Static uu_uniq::options::REPEATED
source · 
pub static REPEATED: &str

\ No newline at end of file
+REPEATED in uu_uniq::options - Rust
Static uu_uniq::options::REPEATED
source · 
pub static REPEATED: &str

\ No newline at end of file
diff --git a/dev/uu_uniq/options/static.SKIP_CHARS.html b/dev/uu_uniq/options/static.SKIP_CHARS.html
index cc0acbfad..5483cc5bf 100644
--- a/dev/uu_uniq/options/static.SKIP_CHARS.html
+++ b/dev/uu_uniq/options/static.SKIP_CHARS.html
@@ -1 +1 @@
-SKIP_CHARS in uu_uniq::options - Rust
Static uu_uniq::options::SKIP_CHARS
source · 
pub static SKIP_CHARS: &str

\ No newline at end of file
+SKIP_CHARS in uu_uniq::options - Rust
Static uu_uniq::options::SKIP_CHARS
source · 
pub static SKIP_CHARS: &str

\ No newline at end of file
diff --git a/dev/uu_uniq/options/static.SKIP_FIELDS.html b/dev/uu_uniq/options/static.SKIP_FIELDS.html
index 07632bfa2..379b96739 100644
--- a/dev/uu_uniq/options/static.SKIP_FIELDS.html
+++ b/dev/uu_uniq/options/static.SKIP_FIELDS.html
@@ -1 +1 @@
-SKIP_FIELDS in uu_uniq::options - Rust
Static uu_uniq::options::SKIP_FIELDS
source · 
pub static SKIP_FIELDS: &str

\ No newline at end of file
+SKIP_FIELDS in uu_uniq::options - Rust
Static uu_uniq::options::SKIP_FIELDS
source · 
pub static SKIP_FIELDS: &str

\ No newline at end of file
diff --git a/dev/uu_uniq/options/static.UNIQUE.html b/dev/uu_uniq/options/static.UNIQUE.html
index ba432c083..9ac526a66 100644
--- a/dev/uu_uniq/options/static.UNIQUE.html
+++ b/dev/uu_uniq/options/static.UNIQUE.html
@@ -1 +1 @@
-UNIQUE in uu_uniq::options - Rust
Static uu_uniq::options::UNIQUE
source · 
pub static UNIQUE: &str

\ No newline at end of file
+UNIQUE in uu_uniq::options - Rust
Static uu_uniq::options::UNIQUE
source · 
pub static UNIQUE: &str

\ No newline at end of file
diff --git a/dev/uu_uniq/options/static.ZERO_TERMINATED.html b/dev/uu_uniq/options/static.ZERO_TERMINATED.html
index 9fe88cc85..69647f9c8 100644
--- a/dev/uu_uniq/options/static.ZERO_TERMINATED.html
+++ b/dev/uu_uniq/options/static.ZERO_TERMINATED.html
@@ -1 +1 @@
-ZERO_TERMINATED in uu_uniq::options - Rust
Static uu_uniq::options::ZERO_TERMINATED
source · 
pub static ZERO_TERMINATED: &str

\ No newline at end of file
+ZERO_TERMINATED in uu_uniq::options - Rust
Static uu_uniq::options::ZERO_TERMINATED
source · 
pub static ZERO_TERMINATED: &str

\ No newline at end of file