Merge remote-tracking branch 'upstream/main' into rust/dependency-renaming

Author: hvitved

rust/ast-generator/src/main.rs

@@ -23,6 +23,9 @@ fn class_name(type_name: &str) -> String {
         "Literal" => "LiteralExpr".to_owned(),
         "ArrayExpr" => "ArrayExprInternal".to_owned(),
         "AsmOptions" => "AsmOptionsList".to_owned(),
+        _ if type_name.starts_with("Record") && type_name != "RecordFieldList" => {
+            type_name.replacen("Record", "Struct", 1)
+        }
         _ if type_name.ends_with("Type") => format!("{}Repr", type_name),
         _ => type_name.to_owned(),
     }
@@ -40,6 +43,7 @@ fn property_name(type_name: &str, field_name: &str) -> String {
         ("SelfParam", "is_amp") => "is_ref",
         ("UseTree", "is_star") => "is_glob",
         (_, "ty") => "type_repr",
+        _ if field_name.contains("record") => &field_name.replacen("record", "struct", 1),
         _ => field_name,
     };
     name.to_owned()

rust/extractor/src/crate_graph.rs

@@ -451,15 +451,15 @@ fn emit_adt(
                 id: trap::TrapId::Star,
                 text: Some(name.to_owned()),
             }));
-            let record_field_list =
+            let struct_field_list =
                 emit_variant_data(trap, crate_graph, db, union_id.into()).into();
             let visibility = emit_visibility(crate_graph, db, trap, visibility);
             items.push(
                 trap.emit(generated::Union {
                     id: trap::TrapId::Star,
                     name,
                     attrs: vec![],
-                    record_field_list,
+                    struct_field_list,
                     generic_param_list: None,
                     visibility,
                     where_clause: None,
@@ -1254,7 +1254,7 @@ fn emit_variant_data(
                             .visibility
                             .resolve(db.upcast(), &variant_id.resolver(db.upcast())),
                     );
-                    trap.emit(generated::RecordField {
+                    trap.emit(generated::StructField {
                         id: trap::TrapId::Star,
                         attrs: vec![],
                         name,