Bumps

.gitignore

@@ -1,2 +1,3 @@
 /target
 Cargo.lock
+.vim

CHANGELOG.md

@@ -1,3 +1,7 @@
+## `0.8.6
+
+* Update to `automerge` 0.6.0
+
 ## `0.8.5`
 
 * Implement `PartialEq` and `Eq` for `Text`

Cargo.toml

@@ -13,5 +13,5 @@ repository = "https://github.com/automerge/autosurgeon"
 license = "MIT"
 
 [workspace.dependencies]
-automerge = "0.5"
-automerge-test = "0.4"
+automerge = "0.6"
+automerge-test = "0.5"

autosurgeon-derive/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "autosurgeon-derive"
-version = "0.8.0"
+version = "0.8.1"
 authors = { workspace = true }
 edition = { workspace = true }
 rust-version = { workspace = true }

autosurgeon-derive/src/reconcile/enum_impl.rs

@@ -62,7 +62,7 @@ impl<'a> TryFrom<&'a syn::Variant> for Variant<'a> {
     }
 }
 
-impl<'a> Variant<'a> {
+impl Variant<'_> {
     fn match_arm(
         &self,
         reconciler_ident: &syn::Ident,
@@ -155,7 +155,7 @@ enum EnumKeyInnerType<'a> {
     NoInnerKeyTuple,
 }
 
-impl<'a> EnumKeyInnerType<'a> {
+impl EnumKeyInnerType<'_> {
     fn get_key(&self, key_type_name: &syn::Ident, variant_name: &syn::Ident) -> TokenStream {
         match self {
             Self::Unit => {
@@ -340,7 +340,7 @@ struct EnumKeyVariant<'a> {
     ty: EnumKeyInnerType<'a>,
 }
 
-impl<'a> EnumKeyVariant<'a> {
+impl EnumKeyVariant<'_> {
     fn non_unit_match_arm(
         &self,
         outer_name: &syn::Ident,
@@ -642,7 +642,7 @@ struct EnumUnnamedField<'a> {
     attrs: attrs::Field,
 }
 
-impl<'a> VariantField for EnumUnnamedField<'a> {
+impl VariantField for EnumUnnamedField<'_> {
     fn name(&self) -> syn::Ident {
         format_ident!("field_{}", self.idx)
     }
@@ -652,13 +652,13 @@ impl<'a> VariantField for EnumUnnamedField<'a> {
     }
 }
 
-impl<'a> EnumUnnamedField<'a> {
+impl EnumUnnamedField<'_> {
     fn name(&self) -> syn::Ident {
         format_ident!("field_{}", self.idx)
     }
 }
 
-impl<'a> Field for EnumUnnamedField<'a> {
+impl Field for EnumUnnamedField<'_> {
     fn attrs(&self) -> &[syn::Attribute] {
         &self.field.attrs
     }
@@ -699,7 +699,7 @@ struct EnumNamedField<'a> {
     name: &'a syn::Ident,
 }
 
-impl<'a> VariantField for EnumNamedField<'a> {
+impl VariantField for EnumNamedField<'_> {
     fn name(&self) -> syn::Ident {
         self.name.clone()
     }

autosurgeon-derive/src/reconcile/struct_impl.rs

@@ -139,7 +139,7 @@ impl<'a> NamedField<'a> {
     }
 }
 
-impl<'a> Field for NamedField<'a> {
+impl Field for NamedField<'_> {
     fn attrs(&self) -> &[syn::Attribute] {
         &self.field.attrs
     }
@@ -202,7 +202,7 @@ impl<'a> TupleField<'a> {
     }
 }
 
-impl<'a> Field for TupleField<'a> {
+impl Field for TupleField<'_> {
     fn attrs(&self) -> &[syn::Attribute] {
         &self.field.attrs
     }

autosurgeon/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "autosurgeon"
-version = "0.8.5"
+version = "0.8.6"
 authors = { workspace = true }
 edition = { workspace = true }
 rust-version = { workspace = true }
@@ -11,7 +11,7 @@ license = { workspace = true }
 
 [dependencies]
 automerge = { workspace = true }
-autosurgeon-derive = { path = "../autosurgeon-derive", version = "0.8.0" }
+autosurgeon-derive = { path = "../autosurgeon-derive", version = "0.8.1" }
 similar = { version = "2.2.1", features = ["unicode"] }
 thiserror = "1.0.37"
 uuid = { version = "1.2.2", optional = true }

autosurgeon/src/doc.rs

@@ -135,8 +135,11 @@ impl ReadDoc for am::AutoCommit {
     }
 }
 
-impl<'a> ReadDoc for am::transaction::Transaction<'a> {
-    type Parents<'b> = am::Parents<'b> where Self: 'b;
+impl ReadDoc for am::transaction::Transaction<'_> {
+    type Parents<'b>
+        = am::Parents<'b>
+    where
+        Self: 'b;
     fn get_heads(&self) -> Vec<am::ChangeHash> {
         am::transaction::Transactable::base_heads(self)
     }

autosurgeon/src/hydrate/impls.rs

@@ -100,7 +100,7 @@ impl<T: Hydrate> Hydrate for Option<T> {
     }
 }
 
-impl<'a, T: Hydrate + Clone> Hydrate for Cow<'a, T> {
+impl<T: Hydrate + Clone> Hydrate for Cow<'_, T> {
     fn hydrate<D: ReadDoc>(
         doc: &D,
         obj: &automerge::ObjId,

autosurgeon/src/lib.rs

@@ -18,7 +18,7 @@
 //! ## Feature Flags
 //!
 //! * `uuid` - Includes implementations of `Reconcile` and `Hydrate` for the [`Uuid`](https://docs.rs/uuid/latest/uuid/) crate which will
-//! reconcile to a [`automerge::ScalarValue::Bytes`]
+//!   reconcile to a [`automerge::ScalarValue::Bytes`]
 //!
 //! ## Example
 //!

autosurgeon/src/prop.rs

@@ -7,7 +7,7 @@ pub enum Prop<'a> {
     Index(u32),
 }
 
-impl<'a> std::fmt::Display for Prop<'a> {
+impl std::fmt::Display for Prop<'_> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             Self::Key(s) => write!(f, "{}", s),
@@ -16,7 +16,7 @@ impl<'a> std::fmt::Display for Prop<'a> {
     }
 }
 
-impl<'a> From<&Prop<'a>> for automerge::Prop {
+impl From<&Prop<'_>> for automerge::Prop {
     fn from(p: &Prop) -> Self {
         match p {
             Prop::Key(k) => automerge::Prop::Map(k.to_string()),
@@ -49,7 +49,7 @@ impl<'a> From<&'a str> for Prop<'a> {
     }
 }
 
-impl<'a> From<am::Prop> for Prop<'a> {
+impl From<am::Prop> for Prop<'_> {
     fn from(p: am::Prop) -> Self {
         match p {
             am::Prop::Map(k) => Prop::Key(Cow::Owned(k)),

autosurgeon/src/reconcile.rs

@@ -415,14 +415,22 @@ struct RootReconciler<'a, D> {
 
 impl<'a, D: Doc> Reconciler for RootReconciler<'a, D> {
     type Error = ReconcileError;
-    type Map<'b> = InMap<'b, D>
-        where Self: 'b;
-    type Seq<'b> = InSeq<'b, D>
-        where Self: 'b;
-    type Text<'b> = InText<'b, D>
-        where Self: 'b;
-    type Counter<'b> = AtCounter<'b, D>
-        where Self: 'b;
+    type Map<'b>
+        = InMap<'b, D>
+    where
+        Self: 'b;
+    type Seq<'b>
+        = InSeq<'b, D>
+    where
+        Self: 'b;
+    type Text<'b>
+        = InText<'b, D>
+    where
+        Self: 'b;
+    type Counter<'b>
+        = AtCounter<'b, D>
+    where
+        Self: 'b;
 
     fn none(&mut self) -> Result<(), Self::Error> {
         Err(ReconcileError::TopLevelNotMap)
@@ -486,7 +494,7 @@ enum PropAction<'a> {
     Insert(u32),
 }
 
-impl<'a> PropAction<'a> {
+impl PropAction<'_> {
     fn get_target<'b, D: Doc>(
         &self,
         doc: &'b D,
@@ -530,16 +538,24 @@ struct PropReconciler<'a, D> {
     action: PropAction<'a>,
 }
 
-impl<'a, D: Doc> Reconciler for PropReconciler<'a, D> {
+impl<D: Doc> Reconciler for PropReconciler<'_, D> {
     type Error = ReconcileError;
-    type Map<'b> = InMap<'b, D>
-        where Self: 'b;
-    type Seq<'b> = InSeq<'b, D>
-        where Self: 'b;
-    type Text<'b> = InText<'b, D>
-        where Self: 'b;
-    type Counter<'b> = AtCounter<'b, D>
-        where Self: 'b;
+    type Map<'b>
+        = InMap<'b, D>
+    where
+        Self: 'b;
+    type Seq<'b>
+        = InSeq<'b, D>
+    where
+        Self: 'b;
+    type Text<'b>
+        = InText<'b, D>
+    where
+        Self: 'b;
+    type Counter<'b>
+        = AtCounter<'b, D>
+    where
+        Self: 'b;
 
     fn none(&mut self) -> Result<(), Self::Error> {
         self.action
@@ -659,7 +675,7 @@ struct AtCounter<'a, D> {
     action: &'a PropAction<'a>,
 }
 
-impl<'a, D: Doc> CounterReconciler for AtCounter<'a, D> {
+impl<D: Doc> CounterReconciler for AtCounter<'_, D> {
     type Error = ReconcileError;
 
     fn increment(&mut self, by: i64) -> Result<(), Self::Error> {
@@ -703,10 +719,12 @@ struct InMap<'a, D> {
     current_obj: automerge::ObjId,
 }
 
-impl<'a, D: Doc> MapReconciler for InMap<'a, D> {
+impl<D: Doc> MapReconciler for InMap<'_, D> {
     type Error = ReconcileError;
-    type EntriesIter<'b> = InMapEntries<'b>
-        where Self: 'b;
+    type EntriesIter<'b>
+        = InMapEntries<'b>
+    where
+        Self: 'b;
 
     fn entries(&self) -> Self::EntriesIter<'_> {
         InMapEntries {
@@ -779,10 +797,12 @@ impl<'a> Iterator for ItemsInSeq<'a> {
     }
 }
 
-impl<'a, D: Doc> SeqReconciler for InSeq<'a, D> {
+impl<D: Doc> SeqReconciler for InSeq<'_, D> {
     type Error = ReconcileError;
-    type ItemIter<'b> = ItemsInSeq<'b>
-        where Self: 'b;
+    type ItemIter<'b>
+        = ItemsInSeq<'b>
+    where
+        Self: 'b;
 
     fn items<'b>(&'_ self) -> Self::ItemIter<'_> {
         ItemsInSeq {
@@ -844,7 +864,7 @@ struct InText<'a, D> {
     obj: automerge::ObjId,
 }
 
-impl<'a, D: Doc> TextReconciler for InText<'a, D> {
+impl<D: Doc> TextReconciler for InText<'_, D> {
     type Error = ReconcileError;
 
     fn splice<S: AsRef<str>>(

autosurgeon/src/reconcile/impls.rs

@@ -56,7 +56,7 @@ impl Reconcile for str {
     }
 }
 
-impl<'a, T: Reconcile + ?Sized> Reconcile for &'a T {
+impl<T: Reconcile + ?Sized> Reconcile for &'_ T {
     type Key<'b> = T::Key<'b>;
     fn reconcile<R: Reconciler>(&self, reconciler: R) -> Result<(), R::Error> {
         (*self).reconcile(reconciler)
@@ -171,6 +171,7 @@ macro_rules! int_impl {
                 Ok(match doc.get(obj, &prop)? {
                     Some((Value::Scalar(s), _)) => {
                         if let ScalarValue::$from(i) = s.as_ref() {
+                            #[allow(irrefutable_let_patterns)]
                             if let Ok(v) = $ty::try_from(*i) {
                                 LoadKey::Found(v)
                             } else {

autosurgeon/src/reconcile/seq.rs

@@ -58,7 +58,7 @@ struct Hook<'a, T, S> {
     items: &'a [T],
 }
 
-impl<'a, T, S> similar::algorithms::DiffHook for Hook<'a, T, S>
+impl<T, S> similar::algorithms::DiffHook for Hook<'_, T, S>
 where
     T: Reconcile,
     S: SeqReconciler,

autosurgeon/src/uuid.rs

@@ -58,7 +58,7 @@ mod tests {
         let uuid = Uuid::new_v4();
         reconcile_prop(&mut doc, ObjId::Root, "secret", uuid).unwrap();
 
-        let hydrated_uuid = hydrate_prop(&doc, ObjId::Root, "secret").unwrap();
+        let hydrated_uuid: Uuid = hydrate_prop(&doc, ObjId::Root, "secret").unwrap();
 
         assert_eq!(uuid, hydrated_uuid);
     }