Update to edition 2021

Author: kevinmehall

Cargo.toml

@@ -11,7 +11,7 @@ description = "A simple Parsing Expression Grammar (PEG) parser generator."
 keywords = ["peg", "parser", "parsing", "grammar"]
 categories = ["parsing"]
 readme = "README.md"
-edition = "2018"
+edition = "2021"
 rust-version = "1.68.0" # if changed, also update .github/workflows/rust.yml
 
 [dependencies]

peg-macros/Cargo.toml

@@ -5,7 +5,7 @@ authors = [ "Kevin Mehall <[email protected]>" ]
 license = "MIT"
 repository = "https://github.com/kevinmehall/rust-peg"
 description = "Procedural macros for rust-peg. To use rust-peg, see the `peg` crate."
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 quote = "1.0"

peg-macros/translate.rs

@@ -968,8 +968,8 @@ fn compile_expr(context: &Context, e: &SpannedExpr, result_used: bool) -> TokenS
                     err_state: &mut ::peg::error::ErrorState,
                     min_prec: i32,
                     lpos: usize,
-                    prefix_atom: &Fn(usize, &mut S, &mut ::peg::error::ErrorState, &Fn(usize, i32, &mut S, &mut ::peg::error::ErrorState) -> ::peg::RuleResult<T>) -> ::peg::RuleResult<T>,
-                    level_code: &Fn(usize, usize, i32, T, &mut S, &mut ::peg::error::ErrorState, &Fn(usize, i32, &mut S, &mut ::peg::error::ErrorState) -> ::peg::RuleResult<T>) -> (T, ::peg::RuleResult<()>),
+                    prefix_atom: &dyn Fn(usize, &mut S, &mut ::peg::error::ErrorState, &dyn Fn(usize, i32, &mut S, &mut ::peg::error::ErrorState) -> ::peg::RuleResult<T>) -> ::peg::RuleResult<T>,
+                    level_code: &dyn Fn(usize, usize, i32, T, &mut S, &mut ::peg::error::ErrorState, &dyn Fn(usize, i32, &mut S, &mut ::peg::error::ErrorState) -> ::peg::RuleResult<T>) -> (T, ::peg::RuleResult<()>),
                 ) -> ::peg::RuleResult<T> {
                     let initial = {
                         prefix_atom(lpos, state, err_state, &|pos, min_prec, state, err_state| {

peg-runtime/Cargo.toml

@@ -5,7 +5,7 @@ authors = [ "Kevin Mehall <[email protected]>" ]
 license = "MIT"
 repository = "https://github.com/kevinmehall/rust-peg"
 description = "Runtime support for rust-peg grammars. To use rust-peg, see the `peg` crate."
-edition = "2018"
+edition = "2021"
 
 [lib]
 path = "lib.rs"