fix

felipensp · Nov 2, 2023 · 7fde202 · 7fde202
1 parent 705eea8
commit 7fde202
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/vlib/v/checker/assign.v b/vlib/v/checker/assign.v
@@ -421,6 +421,9 @@ fn (mut c Checker) assign_stmt(mut node ast.AssignStmt) {
 						}
 					}
 				}
+				if left_type.has_flag(.option) && right is ast.UnsafeExpr {
+					c.error('cannot assign `nil` to option value', right.pos())
+				}
 			}
 			else {
 				if mut left is ast.IndexExpr {

diff --git a/vlib/v/checker/struct.v b/vlib/v/checker/struct.v
@@ -205,6 +205,10 @@ fn (mut c Checker) struct_decl(mut node ast.StructDecl) {
 						c.warn('unnecessary default value of `none`: struct fields are zeroed by default',
 							field.default_expr.pos)
 					}
+					if field.typ.has_flag(.option) && field.default_expr.is_nil() {
+						c.error('cannot assign `nil` to option value',
+							field.default_expr.pos())
+					}
 					continue
 				}
 				if field.typ in ast.unsigned_integer_type_idxs {