feat: update rust to 1.89.0 toolchain and add 1.85.1 msrv (#167)

Co-authored-by: Bas Zalmstra <[email protected]>

Author: zelosleone

Cargo.toml

@@ -16,6 +16,7 @@ edition = "2024"
 readme = "README.md"
 keywords = ["dependency", "solver", "version"]
 categories = ["algorithms"]
+rust-version = "1.85.1"
 
 [package]
 name = "resolvo"
@@ -29,6 +30,7 @@ repository.workspace = true
 license.workspace = true
 edition.workspace = true
 readme.workspace = true
+rust-version.workspace = true
 
 [features]
 diagnostics = ["tabwriter", "human_bytes"]

cpp/CMakeLists.txt

@@ -125,17 +125,21 @@ install(
 
 if(BUILD_SHARED_LIBS)
   if(WIN32)
-    install(FILES $<TARGET_FILE:${resolvo_cpp_impl}> DESTINATION ${CMAKE_INSTALL_BINDIR})
+    install(FILES $<TARGET_FILE:${resolvo_cpp_impl}>
+            DESTINATION ${CMAKE_INSTALL_BINDIR})
   else()
-    install(FILES $<TARGET_FILE:${resolvo_cpp_impl}> DESTINATION ${CMAKE_INSTALL_LIBDIR})
+    install(FILES $<TARGET_FILE:${resolvo_cpp_impl}>
+            DESTINATION ${CMAKE_INSTALL_LIBDIR})
   endif()
   if(WIN32)
-    install(FILES $<TARGET_LINKER_FILE:${resolvo_cpp_impl}> 
-            DESTINATION ${CMAKE_INSTALL_LIBDIR} 
-            RENAME resolvo_cpp.lib)
+    install(
+      FILES $<TARGET_LINKER_FILE:${resolvo_cpp_impl}>
+      DESTINATION ${CMAKE_INSTALL_LIBDIR}
+      RENAME resolvo_cpp.lib)
   endif()
 else()
-    install(FILES $<TARGET_FILE:${resolvo_cpp_impl}> DESTINATION ${CMAKE_INSTALL_LIBDIR})
+  install(FILES $<TARGET_FILE:${resolvo_cpp_impl}>
+          DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()
 
 include(CMakePackageConfigHelpers)

rust-toolchain

@@ -1 +1 @@
-1.86.0
+1.89.0

src/internal/arena.rs

@@ -117,10 +117,10 @@ impl<TId: ArenaId, TValue> Arena<TId, TValue> {
         unsafe {
             let chunks = self.chunks.get();
             (
-                (*chunks)
+                (&mut (*chunks))
                     .get_unchecked_mut(a_chunk)
                     .get_unchecked_mut(a_offset),
-                (*chunks)
+                (&mut (*chunks))
                     .get_unchecked_mut(b_chunk)
                     .get_unchecked_mut(b_offset),
             )
@@ -137,7 +137,7 @@ impl<TId: ArenaId, TValue> Index<TId> for Arena<TId, TValue> {
         let (chunk, offset) = Self::chunk_and_offset(index);
         unsafe {
             let vec = self.chunks.get();
-            (*vec).get_unchecked(chunk).get_unchecked(offset)
+            (&(*vec)).get_unchecked(chunk).get_unchecked(offset)
         }
     }
 }
@@ -179,7 +179,7 @@ impl<'a, TId: ArenaId, TValue> Iterator for ArenaIter<'a, TId, TValue> {
                 let vec = self.arena.chunks.get();
                 Some((
                     TId::from_usize(self.index),
-                    (*vec).get_unchecked(chunk).get_unchecked(offset),
+                    (&(*vec)).get_unchecked(chunk).get_unchecked(offset),
                 ))
             };
 
@@ -207,7 +207,9 @@ impl<'a, TId: ArenaId, TValue> Iterator for ArenaIterMut<'a, TId, TValue> {
                 let vec = self.arena.chunks.get();
                 Some((
                     TId::from_usize(self.index),
-                    (*vec).get_unchecked_mut(chunk).get_unchecked_mut(offset),
+                    (&mut (*vec))
+                        .get_unchecked_mut(chunk)
+                        .get_unchecked_mut(offset),
                 ))
             };
             self.index += 1;

src/solver/clause.rs

@@ -325,7 +325,7 @@ impl Clause {
         disjunction_to_candidates: &Arena<DisjunctionId, Disjunction>,
         mut visit: impl FnMut(Literal),
     ) {
-        self.try_fold_literals(
+        let _ = self.try_fold_literals(
             learnt_clauses,
             requirements_to_sorted_candidates,
             disjunction_to_candidates,