Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions rs_bindings_from_cc/generate_bindings/generate_function.rs
Original file line number Diff line number Diff line change
Expand Up @@ -236,17 +236,22 @@ fn type_by_value_or_under_const_ref<'a>(
errors.add(anyhow!("Expected {value_desc} reference to be immutable, but found mutable reference: {kind_string}"));
*mutability = Mutability::Const;
}
if let RsTypeKind::Record { record: lhs_record, .. } = &**lhs {
if let RsTypeKind::Record { record: lhs_record, .. } = lhs.unalias() {
Ok((lhs, lhs_record))
} else {
bail_to_errors!(errors, "Expected {value_desc} to be a record or a const reference to a record, found a reference that doesn't refer to a record: {kind_string}");
}
}
RsTypeKind::Record { record: ref lhs_record, .. } => Ok((kind, lhs_record)),
_ => bail_to_errors!(
errors,
"Expected {value_desc} to be a record or const reference to a record, found {kind_string}"
),
ref other => {
if let RsTypeKind::Record { record: lhs_record, .. } = other.unalias() {
Ok((kind, lhs_record))
} else {
bail_to_errors!(
errors,
"Expected {value_desc} to be a record or const reference to a record, found {kind_string}"
)
}
}
}
}

Expand Down Expand Up @@ -1040,7 +1045,7 @@ fn adjust_param_types_for_trait_impl(
.iter_mut()
.enumerate()
.map(|(i, param_type)| {
let RsTypeKind::Record { record: param_record, .. } = &param_type else {
let RsTypeKind::Record { record: param_record, .. } = param_type.unalias() else {
return Default::default();
};
if !is_record_clonable(db, param_record.clone()) {
Expand Down
1 change: 1 addition & 0 deletions rs_bindings_from_cc/test/struct/operators/foreign_lib.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

namespace foreign {
struct ForeignType {};
using Alias = ForeignType;
} // namespace foreign

#endif // CRUBIT_RS_BINDINGS_FROM_CC_TEST_STRUCT_OPERATORS_FOREIGN_LIB_H_
8 changes: 8 additions & 0 deletions rs_bindings_from_cc/test/struct/operators/operators.h
Original file line number Diff line number Diff line change
Expand Up @@ -233,4 +233,12 @@ struct OperandForeign {};
inline bool operator==(foreign::ForeignType, OperandForeign) { return true; }
inline bool operator==(OperandForeign, foreign::ForeignType) { return true; }

struct OperandAlias {};
inline bool operator==(const foreign::Alias, const OperandAlias&) {
return true;
}
inline bool operator==(const OperandAlias&, const foreign::Alias) {
return true;
}

#endif // CRUBIT_RS_BINDINGS_FROM_CC_TEST_STRUCT_OPERATORS_OPERATORS_H_
8 changes: 8 additions & 0 deletions rs_bindings_from_cc/test/struct/operators/operators_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -323,3 +323,11 @@ fn test_foreign_eq() {
assert!(s1 == s2);
assert!(s2 == s1);
}

#[gtest]
fn test_alias_eq() {
let s1 = OperandAlias::default();
let s2 = foreign_lib::foreign::ForeignType::default();
assert!(s1 == s2);
assert!(s2 == s1);
}
Loading