Support --edition=2024 (but use the same rules as for 2021)

Author: mattheww

src/command_line.rs

@@ -8,7 +8,7 @@ use crate::testcases;
 use crate::Edition;
 
 const USAGE: &str = "\
-Usage: lexeywan [--edition=2015|2021] [<subcommand>] [...options]
+Usage: lexeywan [--edition=2015|2021|2024] [<subcommand>] [...options]
 
 Subcommands:
  *compare  [--short] [--failures-only] [--details=always|*failures|never]
@@ -51,6 +51,7 @@ fn run_cli_impl() -> Result<(), pico_args::Error> {
     {
         Some("2015") => Edition::E2015,
         Some("2021") => Edition::E2021,
+        Some("2024") => Edition::E2024,
         None => Edition::E2021,
         _ => {
             return Err(pico_args::Error::ArgumentParsingFailed {

src/lex_via_rustc.rs

@@ -162,6 +162,7 @@ pub fn analyse(input: &str, edition: Edition) -> Analysis {
     let rustc_edition = match edition {
         Edition::E2015 => rustc_span::edition::Edition::Edition2015,
         Edition::E2021 => rustc_span::edition::Edition::Edition2021,
+        Edition::E2024 => rustc_span::edition::Edition::Edition2024,
     };
 
     std::panic::catch_unwind(|| {

src/lexlucid/pretokenisation/pretokenisation_rules.rs

@@ -15,9 +15,11 @@ use super::{PretokenData, Rule};
 pub fn list_rules(edition: Edition) -> &'static Vec<&'static Rule> {
     static EDITION_2015_RULES: OnceLock<Vec<&'static Rule>> = OnceLock::new();
     static EDITION_2021_RULES: OnceLock<Vec<&'static Rule>> = OnceLock::new();
+    static EDITION_2024_RULES: OnceLock<Vec<&'static Rule>> = OnceLock::new();
     match edition {
         Edition::E2015 => EDITION_2015_RULES.get_or_init(|| make_rules(RULES_FOR_EDITION_2015)),
         Edition::E2021 => EDITION_2021_RULES.get_or_init(|| make_rules(RULES_FOR_EDITION_2021)),
+        Edition::E2024 => EDITION_2024_RULES.get_or_init(|| make_rules(RULES_FOR_EDITION_2024)),
     }
 }
 
@@ -101,6 +103,32 @@ const RULES_FOR_EDITION_2021: &[RuleName] = [
 ]
 .as_slice();
 
+const RULES_FOR_EDITION_2024: &[RuleName] = [
+    RuleName::Whitespace,
+    RuleName::LineComment,
+    RuleName::BlockComment,
+    RuleName::UnterminatedBlockComment,
+    RuleName::Punctuation,
+    RuleName::SingleQuotedLiteral,
+    RuleName::RawLifetimeOrLabel2021,
+    RuleName::ReservedLifetimeOrLabelPrefix2021,
+    RuleName::NonRawLifetimeOrLabel,
+    RuleName::DoublequotedNonrawLiteral2021,
+    RuleName::DoublequotedHashlessRawLiteral2021,
+    RuleName::DoublequotedHashedRawLiteral2021,
+    RuleName::FloatLiteralWithExponent,
+    RuleName::FloatLiteralWithoutExponent,
+    RuleName::FloatLiteralWithFinalDot,
+    RuleName::IntegerBinaryLiteral,
+    RuleName::IntegerOctalLiteral,
+    RuleName::IntegerHexadecimalLiteral,
+    RuleName::IntegerDecimalLiteral,
+    RuleName::RawIdentifier,
+    RuleName::ReservedPrefixOrUnterminatedLiteral2021,
+    RuleName::NonrawIdentifier,
+]
+.as_slice();
+
 fn make_rules(wanted: &[RuleName]) -> Vec<&'static Rule> {
     static NAMED_RULES: OnceLock<BTreeMap<RuleName, Rule>> = OnceLock::new();
     let named_rules = NAMED_RULES.get_or_init(make_named_rules);

src/main.rs

@@ -19,6 +19,8 @@ enum Edition {
     E2015,
     /// Rust 2021
     E2021,
+    /// Rust 2024
+    E2024,
 }
 
 fn main() -> impl std::process::Termination {