Merge remote-tracking branch 'upstream/master'

Author: andrea-berling

Cargo.lock

@@ -18,7 +18,7 @@ build = "build.rs"
 anyhow = "1.0"
 asyncgit = { path = "./asyncgit", version = "0.26", default-features = false }
 backtrace = "0.3"
-bitflags = "2.5"
+bitflags = "2.6"
 bugreport = "0.5"
 bwrap = { version = "1.3", features = ["use_std"] }
 bytesize = { version = "1.3", default-features = false }

Cargo.toml

@@ -17,7 +17,7 @@ crossbeam-channel = "0.5"
 dirs = "5.0"
 easy-cast = "0.5"
 fuzzy-matcher = "0.3"
-git2 = "0.18"
+git2 = "0.19"
 git2-hooks = { path = "../git2-hooks", version = "0.3" }
 log = "0.4"
 # git2 = { path = "../../extern/git2-rs", features = ["vendored-openssl"]}

asyncgit/Cargo.toml

@@ -2,7 +2,7 @@ use crate::{
 	error::Result, filetreeitems::FileTreeItems,
 	tree_iter::TreeIterator, TreeItemInfo,
 };
-use std::{collections::BTreeSet, path::Path, usize};
+use std::{collections::BTreeSet, path::Path};
 
 ///
 #[derive(Copy, Clone, Debug)]

filetreelist/src/filetree.rs

@@ -7,7 +7,6 @@ use crate::{error::Result, treeitems_iter::TreeItemsIterator};
 use std::{
 	collections::{BTreeSet, HashMap},
 	path::{Path, PathBuf},
-	usize,
 };
 
 ///

filetreelist/src/filetreeitems.rs

@@ -27,8 +27,8 @@ impl<'a, 'b> WordWrapper<'a, 'b> {
 		symbols: &'b mut dyn Iterator<Item = StyledGrapheme<'a>>,
 		max_line_width: u16,
 		trim: bool,
-	) -> WordWrapper<'a, 'b> {
-		WordWrapper {
+	) -> Self {
+		Self {
 			symbols,
 			max_line_width,
 			current_line: vec![],
@@ -152,8 +152,8 @@ impl<'a, 'b> LineTruncator<'a, 'b> {
 	pub fn new(
 		symbols: &'b mut dyn Iterator<Item = StyledGrapheme<'a>>,
 		max_line_width: u16,
-	) -> LineTruncator<'a, 'b> {
-		LineTruncator {
+	) -> Self {
+		Self {
 			symbols,
 			max_line_width,
 			horizontal_offset: 0,