This commit is contained in:
sylvestre
2023-03-11 02:41:23 +00:00
parent a76664c00f
commit fb6cf87130
9 changed files with 17 additions and 19 deletions
+2 -2
View File
@@ -252,7 +252,7 @@
</span>I: PeekRead,
{
<span class="doccomment">/// calls `peek_read` on the internal stream to (re)fill the buffer. Returns a
/// MemoryDecoder providing access to the result or returns an i/o error.
/// `MemoryDecoder` providing access to the result or returns an i/o error.
</span><span class="kw">pub fn </span>peek_read(<span class="kw-2">&amp;mut </span><span class="self">self</span>) -&gt; io::Result&lt;MemoryDecoder&gt; {
<span class="kw">match </span><span class="self">self
</span>.input
@@ -277,7 +277,7 @@
<span class="kw">where
</span>I: HasError,
{
<span class="doccomment">/// calls has_error on the internal stream.
<span class="doccomment">/// calls `has_error` on the internal stream.
</span><span class="kw">fn </span>has_error(<span class="kw-2">&amp;</span><span class="self">self</span>) -&gt; bool {
<span class="self">self</span>.input.has_error()
}
+7 -9
View File
@@ -628,7 +628,6 @@
<a href="#628" id="628">628</a>
<a href="#629" id="629">629</a>
<a href="#630" id="630">630</a>
<a href="#631" id="631">631</a>
</pre><pre class="rust"><code><span class="comment">// * This file is part of the uutils coreutils package.
// *
// * (c) Ben Hirsch &lt;benhirsch24@gmail.com&gt;
@@ -659,17 +658,17 @@
<span class="kw">use </span>std::cmp;
<span class="kw">use </span>std::fmt::Write;
<span class="kw">use </span><span class="kw">crate</span>::byteorder_io::<span class="kw-2">*</span>;
<span class="kw">use </span><span class="kw">crate</span>::formatteriteminfo::<span class="kw-2">*</span>;
<span class="kw">use </span><span class="kw">crate</span>::byteorder_io::ByteOrder;
<span class="kw">use </span><span class="kw">crate</span>::formatteriteminfo::FormatWriter;
<span class="kw">use </span><span class="kw">crate</span>::inputdecoder::{InputDecoder, MemoryDecoder};
<span class="kw">use </span><span class="kw">crate</span>::inputoffset::{InputOffset, Radix};
<span class="kw">use </span><span class="kw">crate</span>::multifilereader::<span class="kw-2">*</span>;
<span class="kw">use </span><span class="kw">crate</span>::multifilereader::{HasError, InputSource, MultifileReader};
<span class="kw">use </span><span class="kw">crate</span>::output_info::OutputInfo;
<span class="kw">use </span><span class="kw">crate</span>::parse_formats::{parse_format_flags, ParsedFormatterItemInfo};
<span class="kw">use </span><span class="kw">crate</span>::parse_inputs::{parse_inputs, CommandLineInputs};
<span class="kw">use </span><span class="kw">crate</span>::parse_nrofbytes::parse_number_of_bytes;
<span class="kw">use </span><span class="kw">crate</span>::partialreader::<span class="kw-2">*</span>;
<span class="kw">use </span><span class="kw">crate</span>::peekreader::<span class="kw-2">*</span>;
<span class="kw">use </span><span class="kw">crate</span>::partialreader::PartialReader;
<span class="kw">use </span><span class="kw">crate</span>::peekreader::{PeekRead, PeekReader};
<span class="kw">use </span><span class="kw">crate</span>::prn_char::format_ascii_dump;
<span class="kw">use </span>clap::ArgAction;
<span class="kw">use </span>clap::{crate_version, parser::ValueSource, Arg, ArgMatches, Command};
@@ -679,10 +678,9 @@
<span class="kw">use </span>uucore::{format_usage, help_about, help_section, help_usage, show_error, show_warning};
<span class="kw">const </span>PEEK_BUFFER_SIZE: usize = <span class="number">4</span>; <span class="comment">// utf-8 can be 4 bytes
</span><span class="kw">const </span>ABOUT: <span class="kw-2">&amp;</span>str = <span class="macro">help_about!</span>(<span class="string">&quot;od.md&quot;</span>);
<span class="kw">const </span>USAGE: <span class="kw-2">&amp;</span>str = <span class="macro">help_usage!</span>(<span class="string">&quot;od.md&quot;</span>);
<span class="kw">const </span>AFTER_HELP: <span class="kw-2">&amp;</span>str = <span class="macro">help_section!</span>(<span class="string">&quot;after help&quot;</span>, <span class="string">&quot;od.md&quot;</span>);
<span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">mod </span>options {
@@ -1091,7 +1089,7 @@
)
}
<span class="doccomment">/// Loops through the input line by line, calling print_bytes to take care of the output.
<span class="doccomment">/// Loops through the input line by line, calling `print_bytes` to take care of the output.
</span><span class="kw">fn </span>odfunc&lt;I&gt;(
input_offset: <span class="kw-2">&amp;mut </span>InputOffset,
input_decoder: <span class="kw-2">&amp;mut </span>InputDecoder&lt;I&gt;,
+1 -1
View File
@@ -586,7 +586,7 @@
/// ```
///
/// This algorithm assumes the size of all types is a power of 2 (1, 2, 4, 8, 16, ...)
/// Increase MAX_BYTES_PER_UNIT to allow larger types.
/// Increase `MAX_BYTES_PER_UNIT` to allow larger types.
</span><span class="kw">fn </span>calculate_alignment(
sf: <span class="kw-2">&amp;</span><span class="kw">dyn </span>TypeSizeInfo,
byte_size_block: usize,
+2 -2
View File
@@ -459,8 +459,8 @@
<span class="doccomment">/// interprets inputs when --traditional is on the command line
///
/// normally returns CommandLineInputs::FileAndOffset, but if no offset is found,
/// it returns CommandLineInputs::FileNames (also to differentiate from the offset == 0)
/// normally returns `CommandLineInputs::FileAndOffset`, but if no offset is found,
/// it returns `CommandLineInputs::FileNames` (also to differentiate from the offset == 0)
</span><span class="kw">pub fn </span>parse_inputs_traditional(input_strings: <span class="kw-2">&amp;</span>[<span class="kw-2">&amp;</span>str]) -&gt; <span class="prelude-ty">Result</span>&lt;CommandLineInputs, String&gt; {
<span class="kw">match </span>input_strings.len() {
<span class="number">0 </span>=&gt; <span class="prelude-val">Ok</span>(CommandLineInputs::FileNames(<span class="macro">vec!</span>[<span class="string">&quot;-&quot;</span>.to_string()])),
+1 -1
View File
@@ -155,7 +155,7 @@
<a href="#155" id="155">155</a>
</pre><pre class="rust"><code><span class="kw">use </span>std::str::from_utf8;
<span class="kw">use </span><span class="kw">crate</span>::formatteriteminfo::<span class="kw-2">*</span>;
<span class="kw">use </span><span class="kw">crate</span>::formatteriteminfo::{FormatWriter, FormatterItemInfo};
<span class="kw">pub static </span>FORMAT_ITEM_A: FormatterItemInfo = FormatterItemInfo {
byte_size: <span class="number">1</span>,
+1 -1
View File
@@ -220,7 +220,7 @@
<span class="kw">use </span>std::f64;
<span class="kw">use </span>std::num::FpCategory;
<span class="kw">use </span><span class="kw">crate</span>::formatteriteminfo::<span class="kw-2">*</span>;
<span class="kw">use </span><span class="kw">crate</span>::formatteriteminfo::{FormatWriter, FormatterItemInfo};
<span class="kw">pub static </span>FORMAT_ITEM_F16: FormatterItemInfo = FormatterItemInfo {
byte_size: <span class="number">2</span>,
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long