chore: Update MSRV

This commit is contained in:
Ed Page 2021-11-08 11:36:05 -06:00
parent 05edccea2e
commit 4f17586d08
6 changed files with 11 additions and 12 deletions

View file

@ -69,7 +69,7 @@ jobs:
- name: No-default features - name: No-default features
run: cargo test --workspace --no-default-features run: cargo test --workspace --no-default-features
msrv: msrv:
name: "Check MSRV: 1.53.0" name: "Check MSRV: 1.54.0"
needs: smoke needs: smoke
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
@ -78,7 +78,7 @@ jobs:
- name: Install Rust - name: Install Rust
uses: actions-rs/toolchain@v1 uses: actions-rs/toolchain@v1
with: with:
toolchain: 1.53.0 # MSRV toolchain: 1.54.0 # MSRV
profile: minimal profile: minimal
override: true override: true
- uses: Swatinem/rust-cache@v1 - uses: Swatinem/rust-cache@v1
@ -133,7 +133,7 @@ jobs:
- name: Install Rust - name: Install Rust
uses: actions-rs/toolchain@v1 uses: actions-rs/toolchain@v1
with: with:
toolchain: 1.53.0 # MSRV toolchain: 1.54.0 # MSRV
profile: minimal profile: minimal
override: true override: true
components: clippy components: clippy

View file

@ -26,7 +26,7 @@ jobs:
- name: Install Rust - name: Install Rust
uses: actions-rs/toolchain@v1 uses: actions-rs/toolchain@v1
with: with:
toolchain: 1.53.0 # MSRV toolchain: 1.54.0 # MSRV
profile: minimal profile: minimal
override: true override: true
components: rustfmt components: rustfmt

View file

@ -57,9 +57,9 @@ jobs:
strategy: strategy:
matrix: matrix:
rust: rust:
- 1.53.0 # MSRV - 1.54.0 # MSRV
- stable - stable
continue-on-error: ${{ matrix.rust != '1.53.0' }} # MSRV continue-on-error: ${{ matrix.rust != '1.54.0' }} # MSRV
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout repository - name: Checkout repository

View file

@ -90,7 +90,7 @@ fn generate_variations<W: std::io::Write>(file: &mut W) {
None None
} else { } else {
referenced_symbols.extend(data.iter().map(|(s, _)| s)); referenced_symbols.extend(data.iter().map(|(s, _)| s));
let value = generate_link(&data); let value = generate_link(data);
Some((*word, value)) Some((*word, value))
} }
}), }),
@ -165,7 +165,7 @@ fn entries() -> BTreeMap<String, varcon_core::Entry> {
.filter(|e| { .filter(|e| {
e.variants e.variants
.iter() .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| { .map(|e| {
let mut e = e.into_owned(); let mut e = e.into_owned();

View file

@ -720,6 +720,7 @@ impl<'s> Iterator for SplitIdent<'s> {
type Item = Word<'s>; type Item = Word<'s>;
fn next(&mut self) -> Option<Word<'s>> { fn next(&mut self) -> Option<Word<'s>> {
#[allow(clippy::while_let_on_iterator)]
while let Some((i, c)) = self.char_indices.next() { while let Some((i, c)) = self.char_indices.next() {
let cur_mode = WordMode::classify(c); let cur_mode = WordMode::classify(c);
if cur_mode == WordMode::Boundary { if cur_mode == WordMode::Boundary {

View file

@ -39,8 +39,7 @@ A Cv: acknowledgment's / Av B C: acknowledgement's
", ",
); );
let all: Vec<_> = iter.collect(); assert_eq!(iter.count(), 1);
assert_eq!(all.len(), 1);
} }
#[test] #[test]
@ -58,8 +57,7 @@ A Cv: acknowledgment's / Av B C: acknowledgement's
", ",
); );
let all: Vec<_> = iter.collect(); assert_eq!(iter.count(), 2);
assert_eq!(all.len(), 2);
} }
} }