From e28ee49e4de64a06fa7b331f6b709ca1e8909126 Mon Sep 17 00:00:00 2001
From: Alex Good <alex@memoryandthought.me>
Date: Thu, 16 May 2024 09:14:02 +0100
Subject: [PATCH 1/3] fix latest clippy complaints

---
 autosurgeon/src/doc.rs | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/autosurgeon/src/doc.rs b/autosurgeon/src/doc.rs
index a9eaf60..22aa123 100644
--- a/autosurgeon/src/doc.rs
+++ b/autosurgeon/src/doc.rs
@@ -16,13 +16,11 @@ pub trait ReadDoc {
     ) -> Result<Option<(Value<'_>, ObjId)>, AutomergeError>;
 
     fn object_type<O: AsRef<ObjId>>(&self, obj: O) -> Option<am::ObjType>;
-    fn map_range<'a, O: AsRef<ObjId>, R: RangeBounds<String>>(
-        &'a self,
-        obj: O,
-        range: R,
-    ) -> am::iter::MapRange<'a, R>
+    fn map_range<'a, O, R>(&'a self, obj: O, range: R) -> am::iter::MapRange<'a, R>
     where
-        R: RangeBounds<String> + 'a;
+        R: RangeBounds<String> + 'a,
+        O: AsRef<ObjId>,
+        R: RangeBounds<String>;
 
     fn list_range<O: AsRef<ObjId>, R: RangeBounds<usize>>(
         &self,
@@ -107,13 +105,11 @@ impl ReadDoc for am::AutoCommit {
             .unwrap_or(None)
     }
 
-    fn map_range<'a, O: AsRef<ObjId>, R: RangeBounds<String>>(
-        &'a self,
-        obj: O,
-        range: R,
-    ) -> am::iter::MapRange<'a, R>
+    fn map_range<'a, O, R>(&'a self, obj: O, range: R) -> am::iter::MapRange<'a, R>
     where
         R: RangeBounds<String> + 'a,
+        O: AsRef<ObjId>,
+        R: RangeBounds<String>,
     {
         am::ReadDoc::map_range(self, obj, range)
     }

From 17a2675923b74179f22c26b9fe0b4c68bcf15604 Mon Sep 17 00:00:00 2001
From: Alex Good <alex@memoryandthought.me>
Date: Thu, 16 May 2024 09:15:36 +0100
Subject: [PATCH 2/3] Update to toolchain 1.78

---
 .github/workflows/ci.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 0acdad6..cc803bb 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.72.0
+          toolchain: 1.78.0
           default: true
           components: rustfmt
       - uses: Swatinem/rust-cache@v2
@@ -29,7 +29,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.72.0
+          toolchain: 1.78.0
           default: true
           components: clippy
       - uses: Swatinem/rust-cache@v2
@@ -56,7 +56,7 @@ jobs:
     strategy:
       matrix:
         toolchain:
-          - 1.72.0
+          - 1.78.0
           - nightly
     continue-on-error: ${{ matrix.toolchain == 'nightly' }}
     steps:
@@ -77,7 +77,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.72.0
+          toolchain: 1.78.0
           default: true
       - uses: Swatinem/rust-cache@v2
       - run: ./scripts/ci/build-test
@@ -90,7 +90,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.72.0
+          toolchain: 1.78.0
           default: true
       - uses: Swatinem/rust-cache@v2
       - run: ./scripts/ci/build-test

From c60fd9e06a1410dc1fc72afc2a2986d9291f1e22 Mon Sep 17 00:00:00 2001
From: Alex Good <alex@memoryandthought.me>
Date: Thu, 16 May 2024 09:18:53 +0100
Subject: [PATCH 3/3] remove --manifest-path argument from cargo deny CI action

---
 .github/workflows/ci.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index cc803bb..84ab978 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -48,7 +48,6 @@ jobs:
       - uses: actions/checkout@v3
       - uses: EmbarkStudios/cargo-deny-action@v1
         with:
-          arguments: '--manifest-path ./Cargo.toml'
           command: check ${{ matrix.checks }}
 
   linux: