test

Author: Rua

.github/workflows/internal-testsuite.yml

@@ -123,7 +123,7 @@ jobs:
         export C2RUST_DIR=$PWD
         # Needs to be run from `tests/integration/` (or further inside)
         # to correctly load the `pyproject.toml`.
-        (cd tests/integration && ./test.py curl json-c lua nginx zstd libxml2 python2 libmcs)
+        (cd tests/integration && ./test.py nginx)
 
     - uses: actions/upload-artifact@v4
       with:

c2rust-macros/src/lib.rs

@@ -26,7 +26,11 @@ impl VisitorImpls {
         let folder_ident = Ident::new(&folder_name, Span::call_site());
 
         if !walk.stmts.is_empty() {
-            let noop_fn_name = format!("noop_{}", method_name);
+            let noop_fn_name = if method_name == "flat_map_trait_item" {
+                String::from("noop_flat_map_assoc_item")
+            } else {
+                format!("noop_{}", method_name)
+            };
             let noop_fn = Ident::new(&noop_fn_name, Span::call_site());
             self.tokens.extend(quote! {
                 impl WalkAst for #ty {
@@ -84,7 +88,11 @@ impl VisitorImpls {
         let folder_ident = Ident::new(&folder_name, Span::call_site());
 
         if !walk.stmts.is_empty() {
-            let noop_fn_name = format!("noop_{}", method_name);
+            let noop_fn_name = if method_name == "flat_map_trait_item" {
+                String::from("noop_flat_map_assoc_item")
+            } else {
+                format!("noop_{}", method_name)
+            };
             let noop_fn = Ident::new(&noop_fn_name, Span::call_site());
             self.tokens.extend(quote! {
                 impl WalkAst for #ty {

c2rust-refactor/src/ast_manip/fold.rs

@@ -130,6 +130,14 @@ pub trait MutVisitor: Sized {
         noop_flat_map_item(i, self)
     }
 
+    fn flat_map_trait_item(
+        &mut self,
+        i: P<AssocItem>,
+        ctxt: AssocCtxt,
+    ) -> SmallVec<[P<AssocItem>; 1]> {
+        noop_flat_map_assoc_item(i, self)
+    }
+
     fn visit_fn_header(&mut self, header: &mut FnHeader) {
         noop_visit_fn_header(header, self);
     }

c2rust-refactor/src/context.rs

@@ -4,8 +4,8 @@ use std::ops::Deref;
 
 use rustc_ast::ptr::P;
 use rustc_ast::{
-    Expr, ExprKind, FnDecl, FnRetTy, ForeignItem, ForeignItemKind, Item, ItemKind, NodeId, Path,
-    QSelf, UseTreeKind, DUMMY_NODE_ID,
+    AssocItem, Expr, ExprKind, FnDecl, FnRetTy, ForeignItem, ForeignItemKind, Item, ItemKind,
+    NodeId, Path, QSelf, UseTreeKind, DUMMY_NODE_ID,
 };
 use rustc_data_structures::fx::FxHashMap;
 use rustc_errors::{DiagnosticBuilder, Level};
@@ -1072,6 +1072,16 @@ impl<'a, 'tcx, 'b> TypeCompare<'a, 'tcx, 'b> {
     pub fn compatible_types(&self, item1: &Item, item2: &Item, match_vis: bool) -> bool {
         use rustc_ast::ItemKind::*;
         match (&item1.kind, &item2.kind) {
+            (Impl(box ref impl1), Impl(box ref impl2)) => {
+                if impl1.items.len() != impl2.items.len() {
+                    return false;
+                }
+
+                (impl1.items.iter())
+                    .zip(impl2.items.iter())
+                    .all(|(item1, item2)| self.compatible_assoc_items(item1, item2, match_vis))
+            }
+
             // * Assure that these two items are in fact of the same type, just to be safe.
             (TyAlias(box ref ta1), TyAlias(box ref ta2)) => {
                 match (
@@ -1226,6 +1236,40 @@ impl<'a, 'tcx, 'b> TypeCompare<'a, 'tcx, 'b> {
         }
     }
 
+    pub fn compatible_assoc_items(
+        &self,
+        item1: &AssocItem,
+        item2: &AssocItem,
+        match_vis: bool,
+    ) -> bool {
+        use rustc_ast::AssocItemKind::*;
+
+        // Unlike for regular items, associated items must also match by name.
+        if item1.ident.as_str() != item2.ident.as_str() {
+            return false;
+        }
+
+        match (&item1.kind, &item2.kind) {
+            (Const(def1, ty1, expr1), Const(def2, ty2, expr2)) => match (
+                self.cx.opt_node_type(item1.id),
+                self.cx.opt_node_type(item2.id),
+            ) {
+                (Some(ty1), Some(ty2)) => {
+                    self.structural_eq_tys(ty1, ty2)
+                        && expr1.unnamed_equiv(expr2)
+                        && def1.unnamed_equiv(def2)
+                }
+                _ => {
+                    self.structural_eq_ast_tys(ty1, ty2, match_vis)
+                        && expr1.unnamed_equiv(expr2)
+                        && def1.unnamed_equiv(def2)
+                }
+            },
+
+            _ => false,
+        }
+    }
+
     /// Compare two function declarations for equivalent argument and return types,
     /// ignoring argument names.
     pub fn compatible_fn_prototypes(&self, decl1: &FnDecl, decl2: &FnDecl) -> bool {