transpile: upgrade most things for edition 2024

.github/workflows/ci.yml

@@ -60,6 +60,8 @@ jobs:
             --profile minimal --component rustfmt,rustc-dev
           rustup toolchain install nightly-2023-04-15 \
             --profile minimal --component rustfmt
+          rustup toolchain install nightly-2026-03-03 \
+            --profile minimal --component rustfmt
 
       - uses: taiki-e/install-action@nextest
 
@@ -126,7 +128,7 @@ jobs:
         run: |
           export RUSTFLAGS="$RUSTFLAGS -D warnings"
           export RUSTDOCFLAGS="-D warnings"
-          cargo nextest run --release --workspace
+          cargo nextest run --release --workspace --no-fail-fast
       - name: Test translator
         run: |
           # `test_translator.py` compiles translated code,
@@ -212,6 +214,6 @@ jobs:
 
       - run: cargo build --release
 
-      - run: cargo nextest run --release --no-tests warn
+      - run: cargo nextest run --release --no-tests warn --no-fail-fast
 
       - run: cargo doc --document-private-items --no-deps

c2rust-ast-builder/src/builder.rs

@@ -1,11 +1,11 @@
 //! Helpers for building AST nodes.  Normally used by calling `mk().some_node(args...)`.
 
-use std::str;
-
 use itertools::intersperse;
 use proc_macro2::{Literal, Punct, Spacing, Span, TokenStream, TokenTree};
 use std::default::Default;
 use std::iter::FromIterator;
+use std::mem;
+use std::str;
 use syn::{__private::ToTokens, punctuated::Punctuated, *};
 
 pub mod properties {
@@ -49,11 +49,12 @@ pub mod properties {
         }
     }
 
-    #[derive(Debug, Clone)]
+    #[derive(Debug, Clone, Copy)]
     pub enum Unsafety {
         Normal,
         Unsafe,
     }
+
     impl ToToken for Unsafety {
         type Token = Token![unsafe];
         fn to_token(&self) -> Option<Self::Token> {
@@ -513,15 +514,15 @@ impl Builder {
         K: Make<Path>,
         V: Make<Lit>,
     {
-        let meta = mk().meta_namevalue(key, value);
+        let meta = self.clone().meta_namevalue(key, value);
         self.prepared_attr(meta)
     }
 
     pub fn single_attr<K>(self, key: K) -> Self
     where
         K: Make<Path>,
     {
-        let meta = mk().meta_path(key);
+        let meta = self.clone().meta_path(key);
         self.prepared_attr(meta)
     }
 
@@ -530,7 +531,7 @@ impl Builder {
         K: Make<Path>,
         V: Make<TokenStream>,
     {
-        let meta = mk().meta_list(func, arguments);
+        let meta = self.clone().meta_list(func, arguments);
         self.prepared_attr(meta)
     }
 
@@ -1684,7 +1685,7 @@ impl Builder {
 
         Box::new(Item::ForeignMod(ItemForeignMod {
             attrs: self.attrs,
-            unsafety: None,
+            unsafety: self.unsafety.to_token(),
             brace_token: token::Brace(self.span),
             items,
             abi,
@@ -1951,6 +1952,13 @@ impl Builder {
         }
     }
 
+    pub fn meta(self, meta: Meta) -> Meta {
+        match self.unsafety {
+            Unsafety::Normal => meta,
+            Unsafety::Unsafe => mk().meta_list("unsafe", vec![meta]),
+        }
+    }
+
     /// makes a meta item with just a path
     /// # Examples
     ///
@@ -1960,7 +1968,7 @@ impl Builder {
         Pa: Make<Path>,
     {
         let path = path.make(&self);
-        Meta::Path(path)
+        self.meta(Meta::Path(path))
     }
 
     /// makes a meta item with the given path and some arguments
@@ -1974,34 +1982,35 @@ impl Builder {
     {
         let path = path.make(&self);
         let args = args.make(&self);
-        Meta::List(MetaList {
+        let span = self.span;
+        self.meta(Meta::List(MetaList {
             path,
-            delimiter: MacroDelimiter::Paren(token::Paren(self.span)),
+            delimiter: MacroDelimiter::Paren(token::Paren(span)),
             tokens: args,
-        })
+        }))
     }
 
     /// makes a meta item with key value argument
     /// # Examples
     ///
     /// mk().meta_namevalue("target_os", "linux") // ->  `target_os = "linux"`
-    pub fn meta_namevalue<K, V>(self, key: K, value: V) -> Meta
+    pub fn meta_namevalue<K, V>(mut self, key: K, value: V) -> Meta
     where
         K: Make<Path>,
         V: Make<Lit>,
     {
         let key = key.make(&self);
         let lit = value.make(&self);
         let value = Expr::Lit(ExprLit {
-            attrs: self.attrs,
+            attrs: mem::take(&mut self.attrs),
             lit,
         });
-
-        Meta::NameValue(MetaNameValue {
+        let span = self.span;
+        self.meta(Meta::NameValue(MetaNameValue {
             path: key,
-            eq_token: Token![=](self.span),
+            eq_token: Token![=](span),
             value,
-        })
+        }))
     }
 
     pub fn empty_mac<Pa>(self, path: Pa, delim: MacroDelimiter) -> Macro

c2rust-refactor/tests/snapshots.rs

@@ -6,7 +6,7 @@ use c2rust_refactor::RustcArgSource;
 use c2rust_rust_tools::rustc;
 use c2rust_rust_tools::rustfmt;
 use c2rust_rust_tools::sanitize_file_name;
-use c2rust_rust_tools::EDITION;
+use c2rust_rust_tools::RustEdition;
 use insta::assert_snapshot;
 use itertools::Itertools;
 use std::path::Path;
@@ -16,6 +16,7 @@ struct RefactorTest<'a> {
     command: &'a str,
     command_args: &'a [&'a str],
     path: Option<&'a str>,
+    edition: RustEdition,
     old_expect_format_error: bool,
     new_expect_format_error: bool,
     old_expect_compile_error: bool,
@@ -27,6 +28,7 @@ fn refactor(command: &str) -> RefactorTest {
         command,
         command_args: &[],
         path: None,
+        edition: Default::default(),
         old_expect_format_error: false,
         new_expect_format_error: false,
         old_expect_compile_error: false,
@@ -50,6 +52,11 @@ impl<'a> RefactorTest<'a> {
         }
     }
 
+    #[allow(unused)] // TODO remove once `c2rust-refactor` is upgraded to edition 2024.
+    pub fn edition(self, edition: RustEdition) -> Self {
+        Self { edition, ..self }
+    }
+
     pub fn old_expect_format_error(self, expect_error: bool) -> Self {
         Self {
             old_expect_format_error: expect_error,
@@ -93,6 +100,7 @@ impl<'a> RefactorTest<'a> {
             command,
             path,
             command_args,
+            edition,
             old_expect_format_error,
             new_expect_format_error,
             old_expect_compile_error,
@@ -110,6 +118,7 @@ impl<'a> RefactorTest<'a> {
             command,
             command_args,
             path,
+            edition,
             old_expect_format_error,
             new_expect_format_error,
             old_expect_compile_error,
@@ -122,6 +131,7 @@ fn test_refactor(
     command: &str,
     command_args: &[&str],
     path: &str,
+    edition: RustEdition,
     old_expect_format_error: bool,
     new_expect_format_error: bool,
     old_expect_compile_error: bool,
@@ -131,17 +141,19 @@ fn test_refactor(
     let old_path = tests_dir.join(path);
 
     rustfmt(&old_path)
+        .edition(edition)
         .check(true)
         .expect_error(old_expect_format_error)
         .run();
     rustc(&old_path)
+        .edition(edition)
         .expect_error(old_expect_compile_error)
         .run();
 
     let new_path = old_path.with_extension("new"); // Output from `alongside`.
 
     let old_path = old_path.to_str().unwrap();
-    let rustc_args = [old_path, "--edition", EDITION];
+    let rustc_args = [old_path, "--edition", edition.as_str()];
 
     lib_main(Options {
         rewrite_modes: vec![OutputMode::Alongside],
@@ -164,9 +176,11 @@ fn test_refactor(
     // TODO Run `rustfmt` by default as part of `c2rust-refactor`
     // with the same `--disable-rustfmt` flag that `c2rust-transpile` has.
     rustfmt(&new_path)
+        .edition(edition)
         .expect_error(new_expect_format_error)
         .run();
     rustc(&new_path)
+        .edition(edition)
         .expect_error(new_expect_compile_error)
         .run();
 

c2rust-rust-tools/Cargo.toml

@@ -13,4 +13,5 @@ categories.workspace = true
 
 [dependencies]
 fs-err = "3.3.0"
+itertools = "0.14.0"
 log = "=0.4.28" # "0.4.29" requires Rust 1.68