diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0acdad6..84ab978 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 @@ -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: @@ -56,7 +55,7 @@ jobs: strategy: matrix: toolchain: - - 1.72.0 + - 1.78.0 - nightly continue-on-error: ${{ matrix.toolchain == 'nightly' }} steps: @@ -77,7 +76,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 +89,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 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, ObjId)>, AutomergeError>; fn object_type>(&self, obj: O) -> Option; - fn map_range<'a, O: AsRef, R: RangeBounds>( - &'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 + 'a; + R: RangeBounds + 'a, + O: AsRef, + R: RangeBounds; fn list_range, R: RangeBounds>( &self, @@ -107,13 +105,11 @@ impl ReadDoc for am::AutoCommit { .unwrap_or(None) } - fn map_range<'a, O: AsRef, R: RangeBounds>( - &'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 + 'a, + O: AsRef, + R: RangeBounds, { am::ReadDoc::map_range(self, obj, range) }