update toolchain to avoid miscompilation

Author: Byron

crates/but-action/src/lib.rs

@@ -27,7 +27,6 @@ mod grouping;
 mod openai;
 pub mod rename_branch;
 pub mod reword;
-mod serialize;
 mod simple;
 mod workflow;
 pub use action::ActionListing;

crates/but-action/src/serialize.rs

@@ -813,7 +813,7 @@ impl Graph {
             self[sidx]
                 .ref_name
                 .as_ref()
-                .filter(|rn| (rn.category() == Some(Category::RemoteBranch)))
+                .filter(|rn| rn.category() == Some(Category::RemoteBranch))
                 .map(|rn| (sidx, rn))
         }) {
             remote_sidx_by_ref_name.insert(remote_ref_name.clone(), remote_sidx);

crates/but-graph/src/init/post.rs

@@ -1,15 +1,9 @@
 /// The name of the file holding our state, useful for watching for changes.
 use anyhow::Result;
 use gitbutler_command_context::CommandContext;
-use serde::{Deserialize, Serialize};
 
 use crate::HunkAssignment;
 
-#[derive(Serialize, Deserialize, Debug, Clone, Default)]
-pub struct HunkAssignments {
-    pub assignments: Vec<HunkAssignment>,
-}
-
 pub fn assignments(ctx: &mut CommandContext) -> Result<Vec<HunkAssignment>> {
     let assignments = ctx
         .db()?

crates/but-hunk-assignment/src/state.rs

@@ -1,4 +1,3 @@
-#![feature(unsigned_signed_diff)]
 #![deny(missing_docs)]
 
 //! ## Module Guidelines

crates/but-hunk-dependency/src/lib.rs

@@ -29,5 +29,5 @@ pub(crate) fn stack_id_by_commit_id(
     }) {
         return Ok(*id);
     }
-    anyhow::bail!("No stack found for commit {}", oid.to_string())
+    anyhow::bail!("No stack found for commit {}", oid)
 }

crates/but/src/rub/undo.rs

@@ -24,7 +24,7 @@ pub struct BranchManager<'l> {
 }
 
 pub trait BranchManagerExt {
-    fn branch_manager(&self) -> BranchManager;
+    fn branch_manager(&self) -> BranchManager<'_>;
 }
 
 impl BranchManagerExt for CommandContext {

crates/gitbutler-branch-actions/src/branch_manager/mod.rs

@@ -1,6 +1,5 @@
 use crate::{hunk::VirtualBranchHunk, status::get_applied_status_cached, VirtualBranchesExt};
 use anyhow::{anyhow, bail, Context, Result};
-use bstr::BString;
 use but_rebase::RebaseStep;
 use but_workspace::stack_ext::StackExt;
 use gitbutler_branch::dedup;
@@ -10,8 +9,7 @@ use gitbutler_command_context::CommandContext;
 use gitbutler_commit::commit_ext::CommitExt;
 use gitbutler_diff::GitHunk;
 use gitbutler_oxidize::{
-    git2_signature_to_gix_signature, git2_to_gix_object_id, gix_to_git2_oid, GixRepositoryExt,
-    ObjectIdExt, OidExt,
+    git2_to_gix_object_id, gix_to_git2_oid, GixRepositoryExt, ObjectIdExt, OidExt,
 };
 use gitbutler_project::AUTO_TRACK_LIMIT_BYTES;
 use gitbutler_reference::{normalize_branch_name, Refname, RemoteRefname};
@@ -66,26 +64,6 @@ impl From<but_workspace::ui::Author> for crate::author::Author {
     }
 }
 
-/// The commit-data we can use for comparison to see which remote-commit was used to craete
-/// a local commit from.
-/// Note that trees can't be used for comparison as these are typically rebased.
-#[derive(Debug, Hash, Eq, PartialEq)]
-pub(crate) struct CommitData {
-    message: BString,
-    author: gix::actor::Signature,
-}
-
-impl TryFrom<&git2::Commit<'_>> for CommitData {
-    type Error = anyhow::Error;
-
-    fn try_from(commit: &git2::Commit<'_>) -> std::result::Result<Self, Self::Error> {
-        Ok(CommitData {
-            message: commit.message_raw_bytes().into(),
-            author: git2_signature_to_gix_signature(commit.author()),
-        })
-    }
-}
-
 pub fn update_stack(ctx: &CommandContext, update: &BranchUpdateRequest) -> Result<Stack> {
     let vb_state = ctx.project().virtual_branches();
     let mut stack = vb_state.get_stack_in_workspace(update.id.context("BUG(opt-stack-id)")?)?;

crates/gitbutler-branch-actions/src/virtual.rs

@@ -39,7 +39,11 @@ pub trait RepositoryExt {
     ///
     /// Unless you want to find a particular side, you likely want to pass Default::default()
     /// as the [`side`](ConflictedTreeKey) which will give the automatically resolved resolution
-    fn find_real_tree(&self, commit: &git2::Commit, side: ConflictedTreeKey) -> Result<git2::Tree>;
+    fn find_real_tree(
+        &self,
+        commit: &git2::Commit,
+        side: ConflictedTreeKey,
+    ) -> Result<git2::Tree<'_>>;
 }
 
 pub trait GixRepositoryExt {

crates/gitbutler-cherry-pick/src/lib.rs

@@ -1,4 +1,3 @@
-#![feature(unsigned_signed_diff)]
 pub(crate) mod hunk;
 pub mod input;
 pub mod locks;