Skip to content

Commit 28cdb15

Browse files
tyranrontyranron
committed
Switch to 2024 Rust edition
- bump up MSRV to 1.85 - tune lints for 1.85 Rust - revisit `rustfmt` rules
1 parent 3737dc6 commit 28cdb15

File tree

12 files changed

+89
-105
lines changed

12 files changed

+89
-105
lines changed

‎.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
strategy:
102102
fail-fast: false
103103
matrix:
104-
msrv: ["1.81.0"]
104+
msrv: ["1.85.0"]
105105
os: ["ubuntu", "macOS", "windows"]
106106
runs-on: ${{ matrix.os }}-latest
107107
steps:

‎.rustfmt.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@
33
# https://github.com/rust-lang/rustfmt/blob/master/Configurations.md
44

55
max_width = 80
6-
format_strings = false
6+
use_small_heuristics = "Max"
7+
8+
group_imports = "StdExternalCrate"
79
imports_granularity = "Crate"
810

11+
format_strings = false
912
format_code_in_doc_comments = true
1013
format_macro_matchers = true
1114
use_try_shorthand = true

‎CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,19 @@ All user visible changes to `cucumber-expressions` crate will be documented in t
66

77

88

9+
## main
10+
11+
[Diff](https://github.com/cucumber-rs/cucumber-expressions/compare/v0.4.0...main)
12+
13+
### BC Breaks
14+
15+
- Bumped up [MSRV] to 1.85 because of migration to 2024 edition. ([todo])
16+
17+
[todo]: https://github.com/cucumber-rs/cucumber-expressions/commit/todo
18+
19+
20+
21+
922
## [0.4.0] · 2025-02-03
1023
[0.4.0]: https://github.com/cucumber-rs/cucumber-expressions/tree/v0.4.0
1124

‎Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[package]
22
name = "cucumber-expressions"
33
version = "0.4.0"
4-
edition = "2021"
5-
rust-version = "1.81"
4+
edition = "2024"
5+
rust-version = "1.85"
66
description = "Cucumber Expressions AST and parser."
77
license = "MIT OR Apache-2.0"
88
authors = [

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
===============================
33

44
[![crates.io](https://img.shields.io/crates/v/cucumber-expressions.svg?maxAge=2592000 "crates.io")](https://crates.io/crates/cucumber-expressions)
5-
[![Rust 1.81+](https://img.shields.io/badge/rustc-1.81+-lightgray.svg "Rust 1.81+")](https://blog.rust-lang.org/2024/09/05/Rust-1.81.0.html)
5+
[![Rust 1.85+](https://img.shields.io/badge/rustc-1.85+-lightgray.svg "Rust 1.85+")](https://blog.rust-lang.org/2025/02/20/Rust-1.85.0.html)
66
[![Unsafe Forbidden](https://img.shields.io/badge/unsafe-forbidden-success.svg "Unsafe forbidden")](https://github.com/rust-secure-code/safety-dance)
77
[![CI](https://github.com/cucumber-rs/cucumber-expressions/actions/workflows/ci.yml/badge.svg?branch=main "CI")](https://github.com/cucumber-rs/cucumber-expressions/actions?query=workflow%3ACI+branch%3Amain)
88
[![Rust docs](https://docs.rs/cucumber-expressions/badge.svg "Rust docs")](https://docs.rs/cucumber-expressions)

‎fuzz/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[package]
22
name = "cucumber-expressions-fuzz"
33
version = "0.0.0"
4-
edition = "2021"
5-
rust-version = "1.81"
4+
edition = "2024"
5+
rust-version = "1.85"
66
description = "Fuzz testing for `cucumber-expressions` crate."
77
license = "MIT OR Apache-2.0"
88
authors = [

‎src/ast.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
//! [AST]: https://en.wikipedia.org/wiki/Abstract_syntax_tree
1818
1919
use derive_more::with_trait::{AsRef, Deref, DerefMut};
20-
use nom::{error::ErrorKind, Err, Input};
20+
use nom::{Err, Input, error::ErrorKind};
2121
use nom_locate::LocatedSpan;
2222

2323
use crate::parse;
@@ -131,9 +131,7 @@ impl<I: Input> Alternation<I> {
131131
/// [`Optional`]s.
132132
pub(crate) fn contains_only_optional(&self) -> bool {
133133
(**self).iter().any(|single_alt| {
134-
single_alt
135-
.iter()
136-
.all(|alt| matches!(alt, Alternative::Optional(_)))
134+
single_alt.iter().all(|alt| matches!(alt, Alternative::Optional(_)))
137135
})
138136
}
139137
}

‎src/combinator.rs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
//! Helper parser combinators.
1212
1313
use nom::{
14-
error::{ErrorKind, ParseError},
1514
AsChar, Err, IResult, Input, Offset, Parser,
15+
error::{ErrorKind, ParseError},
1616
};
1717

1818
/// Applies the given `map` function to the `parser`'s [`IResult`] in case it
@@ -44,13 +44,16 @@ where
4444
/// non-`escapable` `Input` or end of line.
4545
///
4646
/// [`escaped()`]: nom::bytes::complete::escaped()
47-
pub(crate) fn escaped0<'a, I, Error, F, G>(
47+
// TODO: Try relax RPIT lifetimes overcapturing once rust-lang/rust#130043 is
48+
// fully implemented and `use<..>` syntax allows specific type params:
49+
// https://github.com/rust-lang/rust/issues/130043
50+
pub(crate) fn escaped0<I, Error, F, G>(
4851
mut normal: F,
4952
control_char: char,
5053
mut escapable: G,
5154
) -> impl FnMut(I) -> IResult<I, I, Error>
5255
where
53-
I: Clone + Offset + Input + 'a,
56+
I: Clone + Offset + Input,
5457
<I as Input>::Item: AsChar,
5558
F: Parser<I, Error = Error>,
5659
G: Parser<I, Error = Error>,
@@ -130,10 +133,10 @@ where
130133
#[cfg(test)]
131134
mod escaped0_spec {
132135
use nom::{
136+
Err, IResult,
133137
bytes::complete::escaped,
134138
character::complete::{digit0, digit1, one_of},
135139
error::{Error, ErrorKind},
136-
Err, IResult,
137140
};
138141

139142
use super::escaped0;

‎src/expand/mod.rs

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,13 @@ use either::Either;
2626
use nom::{AsChar, Input};
2727
use regex::Regex;
2828

29-
use crate::{
30-
parse, Alternation, Alternative, Expression, Optional, Parameter,
31-
SingleAlternation, SingleExpression, Spanned,
32-
};
33-
3429
pub use self::parameters::{
3530
Provider as ParametersProvider, WithCustom as WithCustomParameters,
3631
};
32+
use crate::{
33+
Alternation, Alternative, Expression, Optional, Parameter,
34+
SingleAlternation, SingleExpression, Spanned, parse,
35+
};
3736

3837
impl<'s> Expression<Spanned<'s>> {
3938
/// Parses the given `input` as an [`Expression`], and immediately expands
@@ -93,11 +92,9 @@ impl<'s> Expression<Spanned<'s>> {
9392
/// &parameters,
9493
/// )
9594
/// .unwrap();
95+
/// let re = re.as_str();
9696
///
97-
/// assert_eq!(
98-
/// re.as_str(),
99-
/// "^([^\\s]+) has ([Rr]ed|[Gg]reen|[Bb]lue) eyes$",
100-
/// );
97+
/// assert_eq!(re, "^([^\\s]+) has ([Rr]ed|[Gg]reen|[Bb]lue) eyes$");
10198
/// ```
10299
///
103100
/// [`Error`]: enum@Error
@@ -128,10 +125,7 @@ impl<'s> Expression<Spanned<'s>> {
128125
self,
129126
parameters: P,
130127
) -> WithCustomParameters<Self, P> {
131-
WithCustomParameters {
132-
element: self,
133-
parameters,
134-
}
128+
WithCustomParameters { element: self, parameters }
135129
}
136130
}
137131

@@ -488,18 +482,14 @@ where
488482
Iter::Item: Clone,
489483
{
490484
fn clone(&self) -> Self {
491-
Self {
492-
iter: self.iter.clone(),
493-
}
485+
Self { iter: self.iter.clone() }
494486
}
495487
}
496488

497489
impl<Iter: Iterator> SkipLast<Iter> {
498490
/// Creates a new [`SkipLast`] [`Iterator`].
499491
pub fn new(iter: Iter) -> Self {
500-
Self {
501-
iter: iter.peekable(),
502-
}
492+
Self { iter: iter.peekable() }
503493
}
504494
}
505495

@@ -572,10 +562,7 @@ pub struct EscapeForRegex<Iter: Iterator> {
572562
impl<Iter: Iterator> EscapeForRegex<Iter> {
573563
/// Creates a new [`EscapeForRegex`] [`Iterator`].
574564
pub fn new(iter: Iter) -> Self {
575-
Self {
576-
iter: iter.peekable(),
577-
was_escaped: None,
578-
}
565+
Self { iter: iter.peekable(), was_escaped: None }
579566
}
580567
}
581568

‎src/expand/parameters.rs

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@ use std::{collections::HashMap, fmt::Display, iter, str, vec};
1717
use either::Either;
1818
use nom::{AsChar, Input};
1919

20-
use crate::{expand::OwnedChars, Parameter, SingleExpression};
21-
2220
use super::{
2321
Expression, IntoRegexCharIter, ParameterError, ParameterIter,
2422
SingleExpressionIter,
2523
};
24+
use crate::{Parameter, SingleExpression, expand::OwnedChars};
2625

2726
/// Parser of a [Cucumber Expressions][0] [AST] `Element` with [custom][1]
2827
/// `Parameters` in mind.
@@ -106,10 +105,8 @@ where
106105
type Iter = ExpressionWithParsIter<I, Pars>;
107106

108107
fn into_regex_char_iter(self) -> Self::Iter {
109-
let add_pars: fn(_) -> _ = |(item, parameters)| WithCustom {
110-
element: item,
111-
parameters,
112-
};
108+
let add_pars: fn(_) -> _ =
109+
|(item, parameters)| WithCustom { element: item, parameters };
113110
let into_regex_char_iter: fn(_) -> _ =
114111
IntoRegexCharIter::into_regex_char_iter;
115112
iter::once(Ok('^'))
@@ -161,11 +158,8 @@ where
161158

162159
if let SingleExpression::Parameter(item) = self.element {
163160
Left(
164-
WithCustom {
165-
element: item,
166-
parameters: self.parameters,
167-
}
168-
.into_regex_char_iter(),
161+
WithCustom { element: item, parameters: self.parameters }
162+
.into_regex_char_iter(),
169163
)
170164
} else {
171165
Right(self.element.into_regex_char_iter())
@@ -383,9 +377,8 @@ mod regex_hir {
383377

384378
#[cfg(test)]
385379
mod spec {
386-
use crate::expand::Error;
387-
388380
use super::{Expression, HashMap, ParameterError};
381+
use crate::expand::Error;
389382

390383
#[test]
391384
fn custom_parameter() {

0 commit comments

Comments
 (0)