transpile: import Edition{2021,2024} directly

Author: kkysen

c2rust-rust-tools/src/lib.rs

@@ -7,6 +7,9 @@ use std::path::Path;
 use std::process::Command;
 use std::str::FromStr;
 
+use crate::RustEdition::Edition2021;
+use crate::RustEdition::Edition2024;
+
 #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Default, Debug)]
 pub enum RustEdition {
     /// The default is edition 2021 because `c2rust-refactor`,
@@ -17,12 +20,12 @@ pub enum RustEdition {
 }
 
 impl RustEdition {
-    pub const ALL: &[Self] = &[Self::Edition2021, Self::Edition2024];
+    pub const ALL: &[Self] = &[Edition2021, Edition2024];
 
     pub const fn as_str(&self) -> &'static str {
         match self {
-            Self::Edition2021 => "2021",
-            Self::Edition2024 => "2024",
+            Edition2021 => "2021",
+            Edition2024 => "2024",
         }
     }
 
@@ -32,9 +35,9 @@ impl RustEdition {
     pub const fn toolchain(&self) -> &'static str {
         match self {
             // 1.70 (1.68 for syn v2.0, 1.70 for sparse registry)
-            Self::Edition2021 => "+nightly-2023-04-15",
+            Edition2021 => "+nightly-2023-04-15",
             // This doesn't really need to be pinned, but pin it for stability.
-            Self::Edition2024 => "+nightly-2026-03-03",
+            Edition2024 => "+nightly-2026-03-03",
         }
     }
 }

c2rust-transpile/src/build_files/mod.rs

@@ -4,7 +4,8 @@ use std::io::Write;
 use std::path::{Path, PathBuf};
 use std::str::FromStr;
 
-use c2rust_rust_tools::{rustfmt, RustEdition};
+use c2rust_rust_tools::rustfmt;
+use c2rust_rust_tools::RustEdition::Edition2024;
 use handlebars::Handlebars;
 use pathdiff::diff_paths;
 use serde_derive::Serialize;
@@ -330,7 +331,7 @@ fn emit_cargo_toml<'lcmd>(
             "edition": tcfg.edition.as_str(),
             // This is already the default in Rust 1.77,
             // and edition 2024 was released in Rust 1.85.
-            "strip_debuginfo_release": tcfg.edition < RustEdition::Edition2024,
+            "strip_debuginfo_release": tcfg.edition < Edition2024,
             "crate_types": ccfg.link_cmd.r#type.as_cargo_types(),
             "is_library": ccfg.link_cmd.r#type.is_library(),
             "lib_rs_file": get_lib_rs_file_name(tcfg),

c2rust-transpile/src/translator/builtins.rs

@@ -5,6 +5,8 @@ use crate::format_translation_err;
 
 use super::*;
 
+use c2rust_rust_tools::RustEdition::Edition2024;
+
 /// The argument type for a libc builtin function
 #[derive(Copy, Clone, PartialEq)]
 enum LibcFnArgType {
@@ -414,7 +416,7 @@ impl<'c> Translation<'c> {
 
             "__builtin_arm_yield" => {
                 let fn_name = "__yield";
-                if self.tcfg.edition < RustEdition::Edition2024 {
+                if self.tcfg.edition < Edition2024 {
                     self.use_feature("stdsimd");
                 } else {
                     // Edition 2024 was release in Rust 1.85.

c2rust-transpile/src/translator/mod.rs

@@ -7,6 +7,7 @@ use std::path::{Path, PathBuf};
 use std::rc::Rc;
 
 use c2rust_rust_tools::RustEdition;
+use c2rust_rust_tools::RustEdition::Edition2024;
 use dtoa;
 use failure::{err_msg, format_err, Fail};
 use indexmap::indexmap;
@@ -373,7 +374,7 @@ pub fn stmts_block(mut stmts: Vec<Stmt>) -> Block {
 
 /// Whether `extern` blocks can be `unsafe` in this edition.
 fn extern_block_unsafety(edition: RustEdition) -> Unsafety {
-    if edition >= RustEdition::Edition2024 {
+    if edition >= Edition2024 {
         Unsafety::Unsafe
     } else {
         Unsafety::Normal
@@ -382,7 +383,7 @@ fn extern_block_unsafety(edition: RustEdition) -> Unsafety {
 
 /// Whether attributes can be `unsafe` in this edition.
 fn attr_unsafety(edition: RustEdition) -> Unsafety {
-    if edition >= RustEdition::Edition2024 {
+    if edition >= Edition2024 {
         Unsafety::Unsafe
     } else {
         Unsafety::Normal
@@ -1595,7 +1596,7 @@ impl<'c> Translation<'c> {
     /// Called when translation makes use of a language feature that will require a feature-gate.
     pub fn use_feature(&self, feature: &'static str) {
         if matches!(feature, "asm" | "label_break_value" | "raw_ref_op")
-            && self.tcfg.edition >= RustEdition::Edition2024
+            && self.tcfg.edition >= Edition2024
         {
             return;
         }

c2rust-transpile/src/translator/simd.rs

@@ -160,7 +160,7 @@ impl<'c> Translation<'c> {
                 .into());
             }
 
-            if self.tcfg.edition < RustEdition::Edition2024 {
+            if self.tcfg.edition < Edition2024 {
                 // Edition 2024 was release in Rust 1.85.
                 // In Rust 1.78, `#![feature(stdsimd)]` was removed and split into individual features.
                 // All of the x86_64 parts (that we use at least) were stabilized.

c2rust-transpile/tests/snapshots.rs

@@ -7,8 +7,11 @@ use std::process::Command;
 use c2rust_rust_tools::rustc;
 use c2rust_rust_tools::sanitize_file_name;
 use c2rust_rust_tools::RustEdition;
+use c2rust_rust_tools::RustEdition::Edition2021;
+use c2rust_rust_tools::RustEdition::Edition2024;
 use c2rust_transpile::convert_type::RESERVED_NAMES;
-use c2rust_transpile::{ReplaceMode, TranspilerConfig};
+use c2rust_transpile::ReplaceMode;
+use c2rust_transpile::TranspilerConfig;
 use itertools::Itertools;
 
 fn config(edition: RustEdition) -> TranspilerConfig {
@@ -258,13 +261,13 @@ impl<'a> TranspileTest<'a> {
         transpile_snapshot(
             &platform,
             &c_path,
-            RustEdition::Edition2021,
+            Edition2021,
             expect_compile_error_edition_2021,
         );
         transpile_snapshot(
             &platform,
             &c_path,
-            RustEdition::Edition2024,
+            Edition2024,
             expect_compile_error_edition_2024,
         );
     }