Skip to content

Commit

Permalink
Merge pull request #563 from cobalt-org/renovate/rust-1.x
Browse files Browse the repository at this point in the history
chore(deps): update dependency rust to v1.81.0
  • Loading branch information
epage authored Oct 2, 2024
2 parents d879924 + 2bae2f4 commit 22069e4
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .clippy.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
msrv = "1.80.0" # MSRV
msrv = "1.81.0" # MSRV
warn-on-all-wildcard-imports = true
allow-expect-in-tests = true
allow-unwrap-in-tests = true
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@ jobs:
- name: No-default features
run: cargo test --workspace --no-default-features
msrv:
name: "Check MSRV: 1.80.0"
name: "Check MSRV: 1.81.0"
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
toolchain: "1.80.0" # MSRV
toolchain: "1.81.0" # MSRV
- uses: Swatinem/rust-cache@v2
- name: Default features
run: cargo check --workspace --all-targets
Expand Down Expand Up @@ -119,7 +119,7 @@ jobs:
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
toolchain: "1.80.0" # MSRV
toolchain: "1.81.0" # MSRV
components: clippy
- uses: Swatinem/rust-cache@v2
- name: Install SARIF tools
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ members = [
[workspace.package]
license = "MIT OR Apache-2.0"
edition = "2021"
rust-version = "1.80.0" # MSRV
rust-version = "1.81.0" # MSRV
include = [
"build.rs",
"src/**/*",
Expand Down
2 changes: 1 addition & 1 deletion crates/core/src/error/clone.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ impl Clone for Box<dyn ErrorClone> {
}
}

/// A lossy way to have any error be clonable.
/// A lossy way to have any error be cloneable.
#[derive(Debug, Clone)]
pub struct CloneableError {
error: String,
Expand Down
3 changes: 1 addition & 2 deletions crates/core/src/parser/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -765,9 +765,8 @@ pub struct TagTokenIter<'a> {
impl<'a> Iterator for TagTokenIter<'a> {
type Item = TagToken<'a>;
fn next(&mut self) -> Option<Self::Item> {
self.iter.next().map(|next| {
self.iter.next().inspect(|next| {
self.position = next.token.as_span().end_pos();
next
})
}
}
Expand Down
1 change: 1 addition & 0 deletions tests/conformance_ruby/tags/include_tag_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ fn test_nested_include_with_variable() {
}

#[derive(Default, Debug, Clone, Copy)]
#[expect(dead_code)]
struct InfiniteFileSystem;

impl liquid::partials::PartialSource for InfiniteFileSystem {
Expand Down

0 comments on commit 22069e4

Please sign in to comment.