From ce1aa49015eacf68e1c3bfdd9dd0635bba9c5069 Mon Sep 17 00:00:00 2001
From: Waleed Khan <me@waleedkhan.name>
Date: Sat, 11 May 2024 17:18:23 -0700
Subject: [PATCH] cleanup: remove imports that are unnecessary for edition 2021

---
 git-branchless-invoke/src/lib.rs                | 1 -
 git-branchless-lib/src/core/dag.rs              | 2 --
 git-branchless-lib/src/core/eventlog.rs         | 1 -
 git-branchless-lib/src/core/node_descriptors.rs | 1 -
 git-branchless-lib/src/git/oid.rs               | 1 -
 git-branchless-lib/src/git/repo.rs              | 1 -
 git-branchless-lib/src/git/run.rs               | 1 -
 git-branchless-lib/src/git/tree.rs              | 2 --
 git-branchless-lib/tests/test_git_tree.rs       | 7 ++-----
 git-branchless-move/src/lib.rs                  | 1 -
 git-branchless-navigation/src/prompt.rs         | 1 -
 git-branchless-revset/src/builtins.rs           | 1 -
 git-branchless-revset/src/pattern.rs            | 1 -
 git-branchless-smartlog/src/lib.rs              | 2 --
 git-branchless-test/src/lib.rs                  | 1 -
 git-branchless/Cargo.toml                       | 2 +-
 git-branchless/src/commands/wrap.rs             | 1 -
 17 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/git-branchless-invoke/src/lib.rs b/git-branchless-invoke/src/lib.rs
index 9aee014e3..eee43ffaa 100644
--- a/git-branchless-invoke/src/lib.rs
+++ b/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;
diff --git a/git-branchless-lib/src/core/dag.rs b/git-branchless-lib/src/core/dag.rs
index 429a2c850..6af158138 100644
--- a/git-branchless-lib/src/core/dag.rs
+++ b/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;
diff --git a/git-branchless-lib/src/core/eventlog.rs b/git-branchless-lib/src/core/eventlog.rs
index 6e44403e7..f534bf926 100644
--- a/git-branchless-lib/src/core/eventlog.rs
+++ b/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;
diff --git a/git-branchless-lib/src/core/node_descriptors.rs b/git-branchless-lib/src/core/node_descriptors.rs
index 029e900d1..3c4cb9762 100644
--- a/git-branchless-lib/src/core/node_descriptors.rs
+++ b/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;
 
diff --git a/git-branchless-lib/src/git/oid.rs b/git-branchless-lib/src/git/oid.rs
index 30c8d2c5c..3240e0436 100644
--- a/git-branchless-lib/src/git/oid.rs
+++ b/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;
diff --git a/git-branchless-lib/src/git/repo.rs b/git-branchless-lib/src/git/repo.rs
index 6ac3c282a..e6c55dbba 100644
--- a/git-branchless-lib/src/git/repo.rs
+++ b/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};
diff --git a/git-branchless-lib/src/git/run.rs b/git-branchless-lib/src/git/run.rs
index f5fa652e3..b4846902a 100644
--- a/git-branchless-lib/src/git/run.rs
+++ b/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};
diff --git a/git-branchless-lib/src/git/tree.rs b/git-branchless-lib/src/git/tree.rs
index 36231bd4e..96865bf2c 100644
--- a/git-branchless-lib/src/git/tree.rs
+++ b/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;
diff --git a/git-branchless-lib/tests/test_git_tree.rs b/git-branchless-lib/tests/test_git_tree.rs
index 3f0341499..017591be0 100644
--- a/git-branchless-lib/tests/test_git_tree.rs
+++ b/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;
diff --git a/git-branchless-move/src/lib.rs b/git-branchless-move/src/lib.rs
index 68d9f230e..86b081dea 100644
--- a/git-branchless-move/src/lib.rs
+++ b/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;
 
diff --git a/git-branchless-navigation/src/prompt.rs b/git-branchless-navigation/src/prompt.rs
index d1e383a54..1c7fa529b 100644
--- a/git-branchless-navigation/src/prompt.rs
+++ b/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;
diff --git a/git-branchless-revset/src/builtins.rs b/git-branchless-revset/src/builtins.rs
index 68717a33a..ec865e66d 100644
--- a/git-branchless-revset/src/builtins.rs
+++ b/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;
diff --git a/git-branchless-revset/src/pattern.rs b/git-branchless-revset/src/pattern.rs
index 1a112f64a..81db34628 100644
--- a/git-branchless-revset/src/pattern.rs
+++ b/git-branchless-revset/src/pattern.rs
@@ -1,4 +1,3 @@
-use std::convert::TryFrom;
 use std::fmt::Debug;
 use std::sync::{Arc, Mutex};
 
diff --git a/git-branchless-smartlog/src/lib.rs b/git-branchless-smartlog/src/lib.rs
index 03167a86c..e3b3bdc3f 100644
--- a/git-branchless-smartlog/src/lib.rs
+++ b/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;
diff --git a/git-branchless-test/src/lib.rs b/git-branchless-test/src/lib.rs
index 54ab3ad68..a86d3d89d 100644
--- a/git-branchless-test/src/lib.rs
+++ b/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};
diff --git a/git-branchless/Cargo.toml b/git-branchless/Cargo.toml
index f09b3bc67..452ec7821 100644
--- a/git-branchless/Cargo.toml
+++ b/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"
diff --git a/git-branchless/src/commands/wrap.rs b/git-branchless/src/commands/wrap.rs
index 1fe22d3b6..5eb325910 100644
--- a/git-branchless/src/commands/wrap.rs
+++ b/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;