cleanup: remove imports that are unnecessary for edition 2021

git-branchless-invoke/src/lib.rs

@@ -15,7 +15,6 @@
 
 use std::any::Any;
 use std::collections::HashMap;
-use std::convert::TryInto;
 use std::ffi::OsString;
 use std::fmt::Write;
 use std::path::PathBuf;

git-branchless-lib/src/core/dag.rs

@@ -3,10 +3,8 @@
 
 use std::cmp::Ordering;
 use std::collections::HashMap;
-use std::convert::TryFrom;
 use std::fmt::Debug;
 use std::future::Future;
-use std::iter::FromIterator;
 use std::sync::{Arc, Mutex};
 
 use async_trait::async_trait;

git-branchless-lib/src/core/eventlog.rs

@@ -7,7 +7,6 @@
 
 use std::cmp::Ordering;
 use std::collections::{HashMap, HashSet};
-use std::convert::{TryFrom, TryInto};
 
 use std::fmt::Display;
 use std::str::FromStr;

git-branchless-lib/src/core/node_descriptors.rs

@@ -4,7 +4,6 @@
 //! commit message.
 
 use std::collections::{HashMap, HashSet};
-use std::convert::TryInto;
 use std::sync::{Arc, Mutex};
 use std::time::SystemTime;
 

git-branchless-lib/src/git/oid.rs

@@ -1,4 +1,3 @@
-use std::convert::{TryFrom, TryInto};
 use std::ffi::{OsStr, OsString};
 use std::fmt::Display;
 use std::str::FromStr;

git-branchless-lib/src/git/repo.rs

@@ -11,7 +11,6 @@
 
 use std::borrow::Borrow;
 use std::collections::{HashMap, HashSet};
-use std::convert::{TryFrom, TryInto};
 use std::num::TryFromIntError;
 use std::ops::Add;
 use std::path::{Path, PathBuf};

git-branchless-lib/src/git/run.rs

@@ -1,5 +1,4 @@
 use std::collections::HashMap;
-use std::convert::TryInto;
 use std::ffi::{OsStr, OsString};
 use std::fmt::Write;
 use std::io::{BufRead, BufReader, Read, Write as WriteIo};

git-branchless-lib/src/git/tree.rs

@@ -1,7 +1,5 @@
 use std::collections::{HashMap, HashSet};
-use std::convert::TryFrom;
 use std::fmt::Debug;
-use std::iter::FromIterator;
 use std::path::{Path, PathBuf};
 
 use bstr::ByteVec;

git-branchless-lib/tests/test_git_tree.rs

@@ -1,8 +1,5 @@
-use std::{
-    collections::HashMap,
-    convert::TryInto,
-    path::{Path, PathBuf},
-};
+use std::collections::HashMap;
+use std::path::{Path, PathBuf};
 
 use branchless::git::{dehydrate_tree, get_changed_paths_between_trees, hydrate_tree, FileMode};
 use branchless::testing::make_git;

git-branchless-move/src/lib.rs

@@ -13,7 +13,6 @@
 #![allow(clippy::too_many_arguments, clippy::blocks_in_if_conditions)]
 
 use std::collections::HashMap;
-use std::convert::TryFrom;
 use std::fmt::Write;
 use std::time::SystemTime;
 

git-branchless-navigation/src/prompt.rs

@@ -29,7 +29,6 @@ pub fn prompt_select_commit(
 mod skim {
     use eyre::eyre;
     use std::borrow::Cow;
-    use std::convert::TryFrom;
     use std::sync::Arc;
 
     use itertools::Itertools;

git-branchless-revset/src/builtins.rs

@@ -12,7 +12,6 @@ use lib::git::{
 };
 use std::borrow::Cow;
 use std::collections::HashMap;
-use std::convert::TryFrom;
 use tracing::{instrument, warn};
 
 use eyre::Context as EyreContext;

git-branchless-revset/src/pattern.rs

@@ -1,4 +1,3 @@
-use std::convert::TryFrom;
 use std::fmt::Debug;
 use std::sync::{Arc, Mutex};
 

git-branchless-smartlog/src/lib.rs

@@ -45,7 +45,6 @@ use git_branchless_revset::resolve_commits;
 
 mod graph {
     use std::collections::HashMap;
-    use std::convert::TryFrom;
 
     use lib::core::gc::mark_commit_reachable;
     use tracing::instrument;
@@ -377,7 +376,6 @@ mod graph {
 mod render {
     use std::cmp::Ordering;
     use std::collections::HashSet;
-    use std::convert::TryFrom;
 
     use cursive_core::theme::{BaseColor, Effect};
     use cursive_core::utils::markup::StyledString;

git-branchless-test/src/lib.rs

@@ -14,7 +14,6 @@
 mod worker;
 
 use std::collections::{HashMap, HashSet};
-use std::convert::TryFrom;
 use std::fmt::Write as _;
 use std::fs::File;
 use std::path::{Path, PathBuf};

git-branchless/Cargo.toml

@@ -4,7 +4,7 @@ categories = ["command-line-utilities", "development-tools"]
 default-run = "git-branchless"
 description = "Branchless workflow for Git"
 documentation = "https://github.com/arxanas/git-branchless/wiki"
-edition = "2018"
+edition = "2021"
 homepage = "https://github.com/arxanas/git-branchless"
 keywords = ["cli", "git"]
 license = "MIT OR Apache-2.0"

git-branchless/src/commands/wrap.rs

@@ -1,7 +1,6 @@
 //! Wrap a user-provided Git command, so that `git-branchless` can do special
 //! processing.
 
-use std::convert::TryInto;
 use std::process::Command;
 use std::time::SystemTime;