Skip to content

Commit b096696

Browse files
authored
Merge pull request #19059 from paldepind/rust-record-to-struct
Rust: Rename classes with `Record` to `Struct`
2 parents 179bae8 + b2b650d commit b096696

File tree

155 files changed

+1892
-1857
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+1892
-1857
lines changed

rust/ast-generator/src/main.rs

+4
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ fn class_name(type_name: &str) -> String {
2323
"Literal" => "LiteralExpr".to_owned(),
2424
"ArrayExpr" => "ArrayExprInternal".to_owned(),
2525
"AsmOptions" => "AsmOptionsList".to_owned(),
26+
_ if type_name.starts_with("Record") && type_name != "RecordFieldList" => {
27+
type_name.replacen("Record", "Struct", 1)
28+
}
2629
_ if type_name.ends_with("Type") => format!("{}Repr", type_name),
2730
_ => type_name.to_owned(),
2831
}
@@ -40,6 +43,7 @@ fn property_name(type_name: &str, field_name: &str) -> String {
4043
("SelfParam", "is_amp") => "is_ref",
4144
("UseTree", "is_star") => "is_glob",
4245
(_, "ty") => "type_repr",
46+
_ if field_name.contains("record") => &field_name.replacen("record", "struct", 1),
4347
_ => field_name,
4448
};
4549
name.to_owned()

rust/extractor/src/crate_graph.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -442,15 +442,15 @@ fn emit_adt(
442442
id: trap::TrapId::Star,
443443
text: Some(name.to_owned()),
444444
}));
445-
let record_field_list =
445+
let struct_field_list =
446446
emit_variant_data(trap, crate_graph, db, union_id.into()).into();
447447
let visibility = emit_visibility(crate_graph, db, trap, visibility);
448448
items.push(
449449
trap.emit(generated::Union {
450450
id: trap::TrapId::Star,
451451
name,
452452
attrs: vec![],
453-
record_field_list,
453+
struct_field_list,
454454
generic_param_list: None,
455455
visibility,
456456
where_clause: None,
@@ -1245,7 +1245,7 @@ fn emit_variant_data(
12451245
.visibility
12461246
.resolve(db.upcast(), &variant_id.resolver(db.upcast())),
12471247
);
1248-
trap.emit(generated::RecordField {
1248+
trap.emit(generated::StructField {
12491249
id: trap::TrapId::Star,
12501250
attrs: vec![],
12511251
name,

rust/extractor/src/generated/.generated.list

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)