diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8709f46..f1e32e9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,7 +69,7 @@ jobs: - name: No-default features run: cargo test --workspace --no-default-features msrv: - name: "Check MSRV: 1.53.0" + name: "Check MSRV: 1.54.0" needs: smoke runs-on: ubuntu-latest steps: @@ -78,7 +78,7 @@ jobs: - name: Install Rust uses: actions-rs/toolchain@v1 with: - toolchain: 1.53.0 # MSRV + toolchain: 1.54.0 # MSRV profile: minimal override: true - uses: Swatinem/rust-cache@v1 @@ -133,7 +133,7 @@ jobs: - name: Install Rust uses: actions-rs/toolchain@v1 with: - toolchain: 1.53.0 # MSRV + toolchain: 1.54.0 # MSRV profile: minimal override: true components: clippy diff --git a/.github/workflows/codegen.yml b/.github/workflows/codegen.yml index 0f62b60..057b7ac 100644 --- a/.github/workflows/codegen.yml +++ b/.github/workflows/codegen.yml @@ -26,7 +26,7 @@ jobs: - name: Install Rust uses: actions-rs/toolchain@v1 with: - toolchain: 1.53.0 # MSRV + toolchain: 1.54.0 # MSRV profile: minimal override: true components: rustfmt diff --git a/.github/workflows/rust-next.yml b/.github/workflows/rust-next.yml index d0ef8a8..bce29d1 100644 --- a/.github/workflows/rust-next.yml +++ b/.github/workflows/rust-next.yml @@ -57,9 +57,9 @@ jobs: strategy: matrix: rust: - - 1.53.0 # MSRV + - 1.54.0 # MSRV - stable - continue-on-error: ${{ matrix.rust != '1.53.0' }} # MSRV + continue-on-error: ${{ matrix.rust != '1.54.0' }} # MSRV runs-on: ubuntu-latest steps: - name: Checkout repository diff --git a/crates/typos-vars/codegen/src/main.rs b/crates/typos-vars/codegen/src/main.rs index 2a3293e..30174e3 100644 --- a/crates/typos-vars/codegen/src/main.rs +++ b/crates/typos-vars/codegen/src/main.rs @@ -90,7 +90,7 @@ fn generate_variations(file: &mut W) { None } else { referenced_symbols.extend(data.iter().map(|(s, _)| s)); - let value = generate_link(&data); + let value = generate_link(data); Some((*word, value)) } }), @@ -165,7 +165,7 @@ fn entries() -> BTreeMap { .filter(|e| { e.variants .iter() - .all(|v| typos::tokens::Word::new(&v.word, 0).is_ok()) + .all(|v| typos::tokens::Word::new(v.word, 0).is_ok()) }) .map(|e| { let mut e = e.into_owned(); diff --git a/crates/typos/src/tokens.rs b/crates/typos/src/tokens.rs index 992f1e6..426c248 100644 --- a/crates/typos/src/tokens.rs +++ b/crates/typos/src/tokens.rs @@ -720,6 +720,7 @@ impl<'s> Iterator for SplitIdent<'s> { type Item = Word<'s>; fn next(&mut self) -> Option> { + #[allow(clippy::while_let_on_iterator)] while let Some((i, c)) = self.char_indices.next() { let cur_mode = WordMode::classify(c); if cur_mode == WordMode::Boundary { diff --git a/crates/varcon-core/src/parser.rs b/crates/varcon-core/src/parser.rs index 8655f74..cbc2a1b 100644 --- a/crates/varcon-core/src/parser.rs +++ b/crates/varcon-core/src/parser.rs @@ -39,8 +39,7 @@ A Cv: acknowledgment's / Av B C: acknowledgement's ", ); - let all: Vec<_> = iter.collect(); - assert_eq!(all.len(), 1); + assert_eq!(iter.count(), 1); } #[test] @@ -58,8 +57,7 @@ A Cv: acknowledgment's / Av B C: acknowledgement's ", ); - let all: Vec<_> = iter.collect(); - assert_eq!(all.len(), 2); + assert_eq!(iter.count(), 2); } }