From fa7550cad9045bc54d5afc7b45dfcfde60451929 Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Fri, 10 Mar 2023 15:06:07 +0100 Subject: [PATCH] od: expand some wildcard imports --- src/uu/od/src/od.rs | 10 +++++----- src/uu/od/src/prn_char.rs | 2 +- src/uu/od/src/prn_float.rs | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/uu/od/src/od.rs b/src/uu/od/src/od.rs index e41776ac4..1ecb81391 100644 --- a/src/uu/od/src/od.rs +++ b/src/uu/od/src/od.rs @@ -28,17 +28,17 @@ mod prn_int; use std::cmp; use std::fmt::Write; -use crate::byteorder_io::*; -use crate::formatteriteminfo::*; +use crate::byteorder_io::ByteOrder; +use crate::formatteriteminfo::FormatWriter; use crate::inputdecoder::{InputDecoder, MemoryDecoder}; use crate::inputoffset::{InputOffset, Radix}; -use crate::multifilereader::*; +use crate::multifilereader::{HasError, InputSource, MultifileReader}; use crate::output_info::OutputInfo; use crate::parse_formats::{parse_format_flags, ParsedFormatterItemInfo}; use crate::parse_inputs::{parse_inputs, CommandLineInputs}; use crate::parse_nrofbytes::parse_number_of_bytes; -use crate::partialreader::*; -use crate::peekreader::*; +use crate::partialreader::PartialReader; +use crate::peekreader::{PeekRead, PeekReader}; use crate::prn_char::format_ascii_dump; use clap::ArgAction; use clap::{crate_version, parser::ValueSource, Arg, ArgMatches, Command}; diff --git a/src/uu/od/src/prn_char.rs b/src/uu/od/src/prn_char.rs index 495b8eace..7ae6f084c 100644 --- a/src/uu/od/src/prn_char.rs +++ b/src/uu/od/src/prn_char.rs @@ -1,6 +1,6 @@ use std::str::from_utf8; -use crate::formatteriteminfo::*; +use crate::formatteriteminfo::{FormatWriter, FormatterItemInfo}; pub static FORMAT_ITEM_A: FormatterItemInfo = FormatterItemInfo { byte_size: 1, diff --git a/src/uu/od/src/prn_float.rs b/src/uu/od/src/prn_float.rs index be1463163..496275574 100644 --- a/src/uu/od/src/prn_float.rs +++ b/src/uu/od/src/prn_float.rs @@ -3,7 +3,7 @@ use std::f32; use std::f64; use std::num::FpCategory; -use crate::formatteriteminfo::*; +use crate::formatteriteminfo::{FormatWriter, FormatterItemInfo}; pub static FORMAT_ITEM_F16: FormatterItemInfo = FormatterItemInfo { byte_size: 2,