fix nighty and raise msrv

Author: extrawurst

.clippy.toml

@@ -1,2 +1,2 @@
-msrv = "1.65.0"
-cognitive-complexity-threshold = 18
+msrv = "1.70.0"
+cognitive-complexity-threshold = 18

.github/workflows/ci.yml

@@ -220,11 +220,11 @@ jobs:
     - name: Install Rust
       uses: dtolnay/rust-toolchain@nightly
 
-    - name: cargo-udeps
-      run: |
-        # cargo install --locked cargo-udeps
-        cargo install --git https://github.com/est31/cargo-udeps --locked
-        cargo +nightly udeps --all-targets
+    - name: build cargo-udeps
+      run: cargo install --git https://github.com/est31/cargo-udeps --locked
+        
+    - name: run cargo-udeps
+      run: cargo +nightly udeps --all-targets
 
   log-test:
     name: Changelog Test

Cargo.toml

@@ -4,7 +4,7 @@ version = "0.24.3"
 authors = ["extrawurst <[email protected]>"]
 description = "blazing fast terminal-ui for git"
 edition = "2021"
-rust-version = "1.65"
+rust-version = "1.70"
 exclude = [".github/*", ".vscode/*", "assets/*"]
 homepage = "https://github.com/extrawurst/gitui"
 repository = "https://github.com/extrawurst/gitui"

Makefile

@@ -82,6 +82,11 @@ clippy-nightly:
 
 check: fmt clippy test deny
 
+check-nightly:
+	cargo +nightly c
+	cargo +nightly clippy --workspace --all-features
+	cargo +nightly t
+
 deny:
 	cargo deny check
 

README.md

@@ -215,7 +215,7 @@ All contain a single binary file
 
 ### Requirements
 
-- Minimum supported `rust`/`cargo` version: `1.65`
+- Minimum supported `rust`/`cargo` version: `1.70`
   - See [Install Rust](https://www.rust-lang.org/tools/install)
 
 - To build openssl dependency (see https://docs.rs/openssl/latest/openssl/)

asyncgit/src/revlog.rs

@@ -201,7 +201,9 @@ impl AsyncLog {
 	) -> Result<()> {
 		let start_time = Instant::now();
 
-		let mut entries = Vec::with_capacity(LIMIT_COUNT);
+		let mut entries = vec![CommitId::default(); LIMIT_COUNT];
+		entries.resize(0, CommitId::default());
+
 		let r = repo(repo_path)?;
 		let mut walker =
 			LogWalker::new(&r, LIMIT_COUNT)?.filter(filter);

asyncgit/src/sync/blame.rs

@@ -69,11 +69,8 @@ pub fn blame_file(
 		utils::get_head_repo(&repo)?
 	};
 
-	let spec = format!(
-		"{}:{}",
-		commit_id.to_string(),
-		fixup_windows_path(file_path)
-	);
+	let spec =
+		format!("{}:{}", commit_id, fixup_windows_path(file_path));
 
 	let object = repo.revparse_single(&spec)?;
 	let blob = repo.find_blob(object.id())?;

asyncgit/src/sync/commit_files.rs

@@ -162,10 +162,7 @@ pub(crate) fn get_commit_diff<'a>(
 		Some(&mut opts),
 	)?;
 
-	if stashes
-		.map(|stashes| stashes.contains(&id))
-		.unwrap_or_default()
-	{
+	if stashes.is_some_and(|stashes| stashes.contains(&id)) {
 		if let Ok(untracked_commit) = commit.parent_id(2) {
 			let untracked_diff = get_commit_diff(
 				repo,

asyncgit/src/sync/commit_filter.rs

@@ -115,8 +115,7 @@ impl LogFilterSearch {
 				.new_file()
 				.path()
 				.and_then(|file| file.as_os_str().to_str())
-				.map(|file| self.match_text(file))
-				.unwrap_or_default()
+				.is_some_and(|file| self.match_text(file))
 			{
 				return true;
 			}
@@ -125,8 +124,7 @@ impl LogFilterSearch {
 				.old_file()
 				.path()
 				.and_then(|file| file.as_os_str().to_str())
-				.map(|file| self.match_text(file))
-				.unwrap_or_default()
+				.is_some_and(|file| self.match_text(file))
 		})
 	}
 
@@ -194,8 +192,7 @@ pub fn filter_commit_by_search(
 					.ok()
 				})
 				.flatten()
-				.map(|diff| filter.match_diff(&diff))
-				.unwrap_or_default();
+				.is_some_and(|diff| filter.match_diff(&diff));
 
 			let authors_match = filter
 				.options
@@ -205,13 +202,11 @@ pub fn filter_commit_by_search(
 					let name_match = commit
 						.author()
 						.name()
-						.map(|name| filter.match_text(name))
-						.unwrap_or_default();
+						.is_some_and(|name| filter.match_text(name));
 					let mail_match = commit
 						.author()
 						.email()
-						.map(|name| filter.match_text(name))
-						.unwrap_or_default();
+						.is_some_and(|name| filter.match_text(name));
 
 					name_match || mail_match
 				})

asyncgit/src/sync/commits_info.rs

@@ -1,3 +1,5 @@
+use std::fmt::Display;
+
 use super::RepoPath;
 use crate::{error::Result, sync::repository::repo};
 use git2::{Commit, Error, Oid};
@@ -46,9 +48,12 @@ impl CommitId {
 	}
 }
 
-impl ToString for CommitId {
-	fn to_string(&self) -> String {
-		self.0.to_string()
+impl Display for CommitId {
+	fn fmt(
+		&self,
+		f: &mut std::fmt::Formatter<'_>,
+	) -> std::fmt::Result {
+		write!(f, "{}", self.0)
 	}
 }