checker: disallow thread as var name (#19174)

vlang · Aug 25, 2023 · 11337e7 · 11337e7
1 parent 45e6e7d
commit 11337e7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/vlib/v/checker/checker.v b/vlib/v/checker/checker.v
@@ -31,7 +31,7 @@ pub const (
 	array_builtin_methods_chk   = token.new_keywords_matcher_from_array_trie(array_builtin_methods)
 	// TODO: remove `byte` from this list when it is no longer supported
 	reserved_type_names         = ['byte', 'bool', 'char', 'i8', 'i16', 'int', 'i64', 'u8', 'u16',
-		'u32', 'u64', 'f32', 'f64', 'map', 'string', 'rune', 'usize', 'isize', 'voidptr']
+		'u32', 'u64', 'f32', 'f64', 'map', 'string', 'rune', 'usize', 'isize', 'voidptr', 'thread']
 	reserved_type_names_chk     = token.new_keywords_matcher_from_array_trie(reserved_type_names)
 	vroot_is_deprecated_message = '@VROOT is deprecated, use @VMODROOT or @VEXEROOT instead'
 )

diff --git a/vlib/v/checker/tests/thread_as_var_name_err.out b/vlib/v/checker/tests/thread_as_var_name_err.out
@@ -0,0 +1,6 @@
+vlib/v/checker/tests/thread_as_var_name_err.vv:1:1: warning: unused variable: `thread`
+    1 | thread := 4
+      | ~~~~~~
+vlib/v/checker/tests/thread_as_var_name_err.vv:1:1: error: invalid use of reserved type `thread` as a variable name
+    1 | thread := 4
+      | ~~~~~~
diff --git a/vlib/v/checker/tests/thread_as_var_name_err.vv b/vlib/v/checker/tests/thread_as_var_name_err.vv
@@ -0,0 +1 @@
+thread := 4
diff --git a/vlib/v/tests/go_wait_3_test.v b/vlib/v/tests/go_wait_3_test.v
@@ -12,8 +12,8 @@ fn test_method_go_wait() {
 			test: 'hi'
 		}
 	}
-	thread := spawn a.sub.get()
-	r := thread.wait()
+	t := spawn a.sub.get()
+	r := t.wait()
 	assert r == 'hi'
 }