Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ZST methods #795

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
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
8 changes: 8 additions & 0 deletions core/src/hir/defs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -250,4 +250,12 @@ impl<'tcx> TypeDef<'tcx> {
Self::Enum(ty) => &ty.special_method_presence,
}
}

pub fn is_zst(&self) -> bool {
match self {
TypeDef::Struct(st) => st.fields.is_empty(),
TypeDef::OutStruct(st) => st.fields.is_empty(),
_ => false,
}
}
}
16 changes: 0 additions & 16 deletions core/src/hir/lowering.rs
Original file line number Diff line number Diff line change
Expand Up @@ -354,16 +354,6 @@ impl<'ast> LoweringContext<'ast> {
let mut special_method_presence = SpecialMethodPresence::default();
let methods = if attrs.disable {
Vec::new()
} else if ast_struct.fields.is_empty() {
if !ast_struct.methods.is_empty() {
self.errors.push(LoweringError::Other(format!(
"Methods on ZST structs are not yet implemented: {}",
ast_struct.name
)));
return Err(());
} else {
Vec::new()
}
} else {
self.lower_all_methods(
&ast_struct.methods[..],
Expand Down Expand Up @@ -681,12 +671,6 @@ impl<'ast> LoweringContext<'ast> {
.resolve(in_path, self.env)
{
ast::CustomType::Struct(strct) => {
if strct.fields.is_empty() {
self.errors.push(LoweringError::Other(format!(
"zero-size types are not allowed as method arguments: {ty} in {path}"
)));
return Err(());
}
if let Some(tcx_id) = self.lookup_id.resolve_struct(strct) {
let lifetimes =
ltl.lower_generics(&path.lifetimes[..], &strct.lifetimes, ty.is_self());
Expand Down
2 changes: 2 additions & 0 deletions feature_tests/c/include/MyZst.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions feature_tests/cpp/include/MyStruct.d.hpp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions feature_tests/cpp/include/MyStruct.hpp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions feature_tests/cpp/include/MyZst.d.hpp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions feature_tests/cpp/include/MyZst.hpp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 15 additions & 7 deletions feature_tests/dart/lib/src/MyStruct.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions feature_tests/dart/lib/src/MyZst.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 18 additions & 18 deletions feature_tests/dart/lib/src/lib.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions feature_tests/js/api/MyStruct.d.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 19 additions & 1 deletion feature_tests/js/api/MyStruct.mjs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions feature_tests/js/api/MyZst.d.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions feature_tests/js/api/MyZst.mjs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading