rust-tools: rename RustEdition::{Rust => Edition}{2021,2024}

`Edition2024` more closely matches what we normally call it.

Author: kkysen

c2rust-rust-tools/src/lib.rs

@@ -12,17 +12,17 @@ pub enum RustEdition {
     /// The default is edition 2021 because `c2rust-refactor`,
     /// based on `nightly-2022-08-08`, only understands up to edition 2021.
     #[default]
-    Rust2021,
-    Rust2024,
+    Edition2021,
+    Edition2024,
 }
 
 impl RustEdition {
-    pub const ALL: &[Self] = &[Self::Rust2021, Self::Rust2024];
+    pub const ALL: &[Self] = &[Self::Edition2021, Self::Edition2024];
 
     pub const fn as_str(&self) -> &'static str {
         match self {
-            Self::Rust2021 => "2021",
-            Self::Rust2024 => "2024",
+            Self::Edition2021 => "2021",
+            Self::Edition2024 => "2024",
         }
     }
 
@@ -32,9 +32,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::Rust2021 => "+nightly-2023-04-15",
+            Self::Edition2021 => "+nightly-2023-04-15",
             // This doesn't really need to be pinned, but pin it for stability.
-            Self::Rust2024 => "+nightly-2026-03-03",
+            Self::Edition2024 => "+nightly-2026-03-03",
         }
     }
 }
@@ -49,7 +49,7 @@ impl FromStr for RustEdition {
     type Err = String;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let choices = [Self::Rust2021, Self::Rust2024];
+        let choices = [Self::Edition2021, Self::Edition2024];
         choices
             .into_iter()
             .find(|choice| choice.as_str() == s)

c2rust-transpile/src/build_files/mod.rs

@@ -330,7 +330,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::Rust2024,
+            "strip_debuginfo_release": tcfg.edition < RustEdition::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

@@ -414,7 +414,7 @@ impl<'c> Translation<'c> {
 
             "__builtin_arm_yield" => {
                 let fn_name = "__yield";
-                if self.tcfg.edition < RustEdition::Rust2024 {
+                if self.tcfg.edition < RustEdition::Edition2024 {
                     self.use_feature("stdsimd");
                 } else {
                     // Edition 2024 was release in Rust 1.85.

c2rust-transpile/src/translator/mod.rs

@@ -373,7 +373,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::Rust2024 {
+    if edition >= RustEdition::Edition2024 {
         Unsafety::Unsafe
     } else {
         Unsafety::Normal
@@ -382,7 +382,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::Rust2024 {
+    if edition >= RustEdition::Edition2024 {
         Unsafety::Unsafe
     } else {
         Unsafety::Normal
@@ -1595,7 +1595,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::Rust2024
+            && self.tcfg.edition >= RustEdition::Edition2024
         {
             return;
         }

c2rust-transpile/src/translator/simd.rs

@@ -160,7 +160,7 @@ impl<'c> Translation<'c> {
                 .into());
             }
 
-            if self.tcfg.edition < RustEdition::Rust2024 {
+            if self.tcfg.edition < RustEdition::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

@@ -258,13 +258,13 @@ impl<'a> TranspileTest<'a> {
         transpile_snapshot(
             &platform,
             &c_path,
-            RustEdition::Rust2021,
+            RustEdition::Edition2021,
             expect_compile_error_edition_2021,
         );
         transpile_snapshot(
             &platform,
             &c_path,
-            RustEdition::Rust2024,
+            RustEdition::Edition2024,
             expect_compile_error_edition_2024,
         );
     }