Skip to content

Fix type inferencing in partial if blocks #73

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

Open
InnocentZero wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix type inferencing in partial if blocks #73

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
# https://rust-lang.github.io/rustup/concepts/profiles.html
profile = "default"
# When updating, it might be necessary to run `nix flake update`.
channel = "1.90.0"
channel = "1.96.0"
8 changes: 7 additions & 1 deletion src/typechecker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,8 +491,14 @@ impl<'a> Typechecker<'a> {
types.insert(then_type_id);
types.insert(else_type_id);
self.create_oneof(types)
} else if then_type_id != NONE_TYPE {
// If the then-block is not a statement, then the
// resulting type is OneOf(Nothing, then_type)
let mut types = HashSet::new();
types.insert(then_type_id);
types.insert(NONE_TYPE);
self.create_oneof(types)
} else {
// If there's no else block, the if expression is a statement
NONE_TYPE
}
}
Expand Down
Loading