From c6c936f52980b5707e9439de8ef0adeed9f16ed3 Mon Sep 17 00:00:00 2001
From: Terts Diepraam <terts.diepraam@gmail.com>
Date: Fri, 1 Apr 2022 19:11:25 +0200
Subject: [PATCH] all: remove explicit imports of TryFrom and TryInto

This is enabled by the changing the edition from 2018 to 2021
---
 src/uu/dd/src/dd.rs                     | 1 -
 src/uu/head/src/head.rs                 | 1 -
 src/uu/od/src/od.rs                     | 1 -
 src/uu/seq/src/numberparse.rs           | 1 -
 src/uu/sort/src/sort.rs                 | 1 -
 src/uu/split/src/split.rs               | 1 -
 src/uu/stdbuf/src/stdbuf.rs             | 1 -
 src/uu/tail/src/tail.rs                 | 1 -
 src/uucore/src/lib/features/entries.rs  | 1 -
 src/uucore/src/lib/features/fs.rs       | 2 --
 src/uucore/src/lib/parser/parse_size.rs | 1 -
 tests/benches/factor/benches/table.rs   | 1 -
 12 files changed, 13 deletions(-)

diff --git a/src/uu/dd/src/dd.rs b/src/uu/dd/src/dd.rs
index 354e4b261..3b9bb02d8 100644
--- a/src/uu/dd/src/dd.rs
+++ b/src/uu/dd/src/dd.rs
@@ -23,7 +23,6 @@ mod blocks;
 use blocks::conv_block_unblock_helper;
 
 use std::cmp;
-use std::convert::TryInto;
 use std::env;
 use std::fs::{File, OpenOptions};
 use std::io::{self, Read, Seek, Write};
diff --git a/src/uu/head/src/head.rs b/src/uu/head/src/head.rs
index 1ddfc0492..b6d36a4ad 100644
--- a/src/uu/head/src/head.rs
+++ b/src/uu/head/src/head.rs
@@ -6,7 +6,6 @@
 // spell-checker:ignore (vars) zlines BUFWRITER seekable
 
 use clap::{crate_version, Arg, ArgMatches, Command};
-use std::convert::{TryFrom, TryInto};
 use std::ffi::OsString;
 use std::io::{self, BufWriter, ErrorKind, Read, Seek, SeekFrom, Write};
 use uucore::display::Quotable;
diff --git a/src/uu/od/src/od.rs b/src/uu/od/src/od.rs
index 81cfb94de..33fac39d3 100644
--- a/src/uu/od/src/od.rs
+++ b/src/uu/od/src/od.rs
@@ -29,7 +29,6 @@ mod prn_float;
 mod prn_int;
 
 use std::cmp;
-use std::convert::TryFrom;
 
 use crate::byteorder_io::*;
 use crate::formatteriteminfo::*;
diff --git a/src/uu/seq/src/numberparse.rs b/src/uu/seq/src/numberparse.rs
index 06f553478..c3f3656a8 100644
--- a/src/uu/seq/src/numberparse.rs
+++ b/src/uu/seq/src/numberparse.rs
@@ -3,7 +3,6 @@
 //!
 //! This module provides an implementation of [`FromStr`] for the
 //! [`PreciseNumber`] struct.
-use std::convert::TryInto;
 use std::str::FromStr;
 
 use bigdecimal::BigDecimal;
diff --git a/src/uu/sort/src/sort.rs b/src/uu/sort/src/sort.rs
index a1aa92a2b..5c153ebae 100644
--- a/src/uu/sort/src/sort.rs
+++ b/src/uu/sort/src/sort.rs
@@ -33,7 +33,6 @@ use numeric_str_cmp::{human_numeric_str_cmp, numeric_str_cmp, NumInfo, NumInfoPa
 use rand::{thread_rng, Rng};
 use rayon::prelude::*;
 use std::cmp::Ordering;
-use std::convert::TryFrom;
 use std::env;
 use std::error::Error;
 use std::ffi::{OsStr, OsString};
diff --git a/src/uu/split/src/split.rs b/src/uu/split/src/split.rs
index b64b92898..c90c7a6b2 100644
--- a/src/uu/split/src/split.rs
+++ b/src/uu/split/src/split.rs
@@ -14,7 +14,6 @@ mod platform;
 use crate::filenames::FilenameIterator;
 use crate::filenames::SuffixType;
 use clap::{crate_version, Arg, ArgMatches, Command};
-use std::convert::TryInto;
 use std::env;
 use std::fmt;
 use std::fs::{metadata, File};
diff --git a/src/uu/stdbuf/src/stdbuf.rs b/src/uu/stdbuf/src/stdbuf.rs
index 2eedb038b..5e0e71789 100644
--- a/src/uu/stdbuf/src/stdbuf.rs
+++ b/src/uu/stdbuf/src/stdbuf.rs
@@ -11,7 +11,6 @@
 extern crate uucore;
 
 use clap::{crate_version, Arg, ArgMatches, Command};
-use std::convert::{TryFrom, TryInto};
 use std::fs::File;
 use std::io::{self, Write};
 use std::os::unix::process::ExitStatusExt;
diff --git a/src/uu/tail/src/tail.rs b/src/uu/tail/src/tail.rs
index 6654a61fe..96b6daf79 100644
--- a/src/uu/tail/src/tail.rs
+++ b/src/uu/tail/src/tail.rs
@@ -22,7 +22,6 @@ use chunks::ReverseChunks;
 
 use clap::{Arg, Command};
 use std::collections::VecDeque;
-use std::convert::TryInto;
 use std::ffi::OsString;
 use std::fmt;
 use std::fs::{File, Metadata};
diff --git a/src/uucore/src/lib/features/entries.rs b/src/uucore/src/lib/features/entries.rs
index 90f3134ab..0366355d4 100644
--- a/src/uucore/src/lib/features/entries.rs
+++ b/src/uucore/src/lib/features/entries.rs
@@ -41,7 +41,6 @@ use libc::{c_char, c_int, gid_t, uid_t};
 use libc::{getgrgid, getgrnam, getgroups};
 use libc::{getpwnam, getpwuid, group, passwd};
 
-use std::convert::TryInto;
 use std::ffi::{CStr, CString};
 use std::io::Error as IOError;
 use std::io::ErrorKind;
diff --git a/src/uucore/src/lib/features/fs.rs b/src/uucore/src/lib/features/fs.rs
index 5cd6d253d..3963d865c 100644
--- a/src/uucore/src/lib/features/fs.rs
+++ b/src/uucore/src/lib/features/fs.rs
@@ -99,8 +99,6 @@ impl FileInformation {
     pub fn file_size(&self) -> u64 {
         #[cfg(unix)]
         {
-            use std::convert::TryInto;
-
             assert!(self.0.st_size >= 0, "File size is negative");
             self.0.st_size.try_into().unwrap()
         }
diff --git a/src/uucore/src/lib/parser/parse_size.rs b/src/uucore/src/lib/parser/parse_size.rs
index e68c04e5c..28a898825 100644
--- a/src/uucore/src/lib/parser/parse_size.rs
+++ b/src/uucore/src/lib/parser/parse_size.rs
@@ -5,7 +5,6 @@
 
 // spell-checker:ignore (ToDO) hdsf ghead gtail
 
-use std::convert::TryFrom;
 use std::error::Error;
 use std::fmt;
 
diff --git a/tests/benches/factor/benches/table.rs b/tests/benches/factor/benches/table.rs
index 9090c7d51..7f749a10f 100644
--- a/tests/benches/factor/benches/table.rs
+++ b/tests/benches/factor/benches/table.rs
@@ -1,6 +1,5 @@
 use array_init::array_init;
 use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion, Throughput};
-use std::convert::TryInto;
 use uu_factor::{table::*, Factors};
 
 fn table(c: &mut Criterion) {