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.

Sign up for GitHub

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

Do not panic when there is auto impl type check #6094

Merged
merged 1 commit into from
Jun 5, 2024
Merged

Do not panic when there is auto impl type check #6094

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 19 additions & 21 deletions sway-core/src/semantic_analysis/ast_node/declaration/auto_impl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,8 +234,8 @@ where

use std::fmt::Write;
let mut code = String::new();
writeln!(&mut code, "let variant: u64 = buffer.decode::<u64>();").unwrap();
writeln!(&mut code, "match variant {{ {arms} _ => __revert(0), }}").unwrap();
let _ = writeln!(&mut code, "let variant: u64 = buffer.decode::<u64>();");
let _ = writeln!(&mut code, "match variant {{ {arms} _ => __revert(0), }}");

Some(code)
}
Expand Down Expand Up @@ -306,7 +306,7 @@ where

let decl = match nodes[0].content {
AstNodeContent::Declaration(Declaration::FunctionDeclaration(f)) => f,
_ => todo!(),
_ => unreachable!("unexpected node"),
};

if handler.has_errors() {
Expand All @@ -324,21 +324,19 @@ where
assert!(!handler.has_warnings(), "{:?}", handler);

let ctx = self.ctx.by_ref();
let (decl, namespace) = ctx
.scoped_and_namespace(|ctx| {
TyDecl::type_check(
&handler,
ctx,
parsed::Declaration::FunctionDeclaration(decl),
)
})
.unwrap();

assert!(!handler.has_warnings(), "{:?}", handler);
let r = ctx.scoped_and_namespace(|ctx| {
TyDecl::type_check(
&handler,
ctx,
parsed::Declaration::FunctionDeclaration(decl),
)
});

// Uncomment this to understand why an entry function was not generated
// println!("{:#?}", handler);

let (decl, namespace) = r.map_err(|_| handler.clone())?;

if handler.has_errors() || matches!(decl, TyDecl::ErrorRecovery(_, _)) {
Err(handler)
} else {
Expand Down Expand Up @@ -371,21 +369,21 @@ where

let decl = match nodes[0].content {
AstNodeContent::Declaration(Declaration::ImplTrait(f)) => f,
_ => todo!(),
_ => unreachable!("unexpected item"),
};

assert!(!handler.has_errors(), "{:?}", handler);

let ctx = self.ctx.by_ref();
let (decl, namespace) = ctx
.scoped_and_namespace(|ctx| {
TyDecl::type_check(&handler, ctx, Declaration::ImplTrait(decl))
})
.unwrap();
let r = ctx.scoped_and_namespace(|ctx| {
TyDecl::type_check(&handler, ctx, Declaration::ImplTrait(decl))
});

// Uncomment this to understand why auto impl failed for a type.
// println!("{:#?}", handler);

let (decl, namespace) = r.map_err(|_| handler.clone())?;

if handler.has_errors() || matches!(decl, TyDecl::ErrorRecovery(_, _)) {
Err(handler)
} else {
Expand Down Expand Up @@ -785,7 +783,7 @@ where
if let Some(constraint_not_satisfied) = constraint_not_satisfied {
let ty = match constraint_not_satisfied {
CompileError::TraitConstraintNotSatisfied { ty, .. } => ty,
_ => unreachable!(),
_ => unreachable!("unexpected error"),
};
handler.emit_err(CompileError::CouldNotGenerateEntryMissingImpl {
ty,
Expand Down
Loading