replace derive_deref with derive_more

- the latter already used in our transitive dependencies
- derive_more appears better maintained

diff --git a/Cargo.lock b/Cargo.lock
index f2d3832232dabaaadd2880fd8b2af0a4d7e122fc..0fc692cdd834b295715b7548de9af7b55c2cb11d 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -405,6 +405,12 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "convert_case"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
+
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
@@ -688,25 +694,16 @@ dependencies = [
  "uuid",
 ]
 
-[[package]]
-name = "derive_deref"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcdbcee2d9941369faba772587a565f4f534e42cb8d17e5295871de730163b2b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "derive_more"
 version = "0.99.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
 dependencies = [
+ "convert_case",
  "proc-macro2",
  "quote",
+ "rustc_version",
  "syn 2.0.72",
 ]
 
@@ -2359,6 +2356,15 @@ version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
+[[package]]
+name = "rustc_version"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver",
+]
+
 [[package]]
 name = "rustix"
 version = "0.38.34"
@@ -2550,7 +2556,7 @@ dependencies = [
  "crrl",
  "ctrlc",
  "dashu",
- "derive_deref",
+ "derive_more",
  "dirs-next",
  "divrem",
  "ego-tree",
@@ -2655,6 +2661,12 @@ dependencies = [
  "smallvec",
 ]
 
+[[package]]
+name = "semver"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+
 [[package]]
 name = "serde"
 version = "1.0.204"

diff --git a/Cargo.toml b/Cargo.toml
index 131304ef4396c68703ffe201f2bb09e5c36c3c17..0ba4e9aa94dd3ff7e9cbc21bc8c890198c27eb26 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -47,7 +47,7 @@ chrono = "0.4.38"
 cpu-time = "1.0.0"
 crrl = "0.9.0"
 dashu = "0.4.2"
-derive_deref = "1.1.1"
+derive_more = "0.99.18"
 dirs-next = "2.0.0"
 divrem = "1.0.0"
 futures = "0.3"

diff --git a/src/machine/unify.rs b/src/machine/unify.rs
index 7cd3df06f193b6114ad0b1bca3f3e7c06c758159..2e9dd54b5c7fb7117c960b0afaeddc4e65a7026f 100644 (file)
--- a/src/machine/unify.rs
+++ b/src/machine/unify.rs
@@ -9,7 +9,7 @@ use crate::types::*;
 use std::cmp::Ordering;
 use std::ops::{Deref, DerefMut};
 
-use derive_deref::*;
+use derive_more::*;
 use fxhash::FxBuildHasher;
 use indexmap::IndexSet;
 use num_order::NumOrd;
@@ -734,6 +734,7 @@ fn bind_with_occurs_check<U: Unifier>(unifier: &mut U, r: Ref, value: HeapCellVa
 }
 
 #[derive(Deref, DerefMut)]
+#[deref(forward)]
 pub(crate) struct DefaultUnifier<'a> {
     machine_st: &'a mut MachineState,
 }