Skip to content

Commit 726f0a4

Browse files
committed
Update wording of uninitialized value error to be grammatically correct.
- Instead of "May only use initialized value as arguments." it now says "Only initialized values may be used as arguments." Review by @liufengyun
1 parent 30a2333 commit 726f0a4

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

compiler/src/dotty/tools/dotc/transform/init/Semantic.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1042,7 +1042,7 @@ object Semantic {
10421042

10431043
/** Utility definition used for better error-reporting of argument errors */
10441044
case class ArgInfo(value: Value, source: Tree) {
1045-
def promote: Contextual[List[Error]] = value.promote("May only use initialized value as arguments", source)
1045+
def promote: Contextual[List[Error]] = value.promote("Only initialized values may be used as arguments", source)
10461046
}
10471047

10481048
/** Evaluate an expression with the given value for `this` in a given class `klass`

tests/init/neg/closureLeak.check

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
-- Error: tests/init/neg/closureLeak.scala:11:14 -----------------------------------------------------------------------
22
11 | l.foreach(a => a.addX(this)) // error
33
| ^^^^^^^^^^^^^^^^^
4-
| Cannot prove that the value is fully-initialized. May only use initialized value as arguments.
4+
| Cannot prove that the value is fully-initialized. Only initialized values may be used as arguments.
55
|
6-
| The unsafe promotion may cause the following problem:
7-
| Cannot prove that the value is fully initialized. May only use initialized value as arguments.
6+
| The unsafe promotion may cause the following problem:
7+
| Cannot prove that the value is fully initialized. Only initialized values may be used as arguments.

tests/init/neg/default-this.check

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-- Error: tests/init/neg/default-this.scala:9:8 ------------------------------------------------------------------------
22
9 | compare() // error
33
| ^^^^^^^
4-
| Cannot prove that the value is fully initialized. May only use initialized value as arguments. Calling trace:
5-
| -> val result = updateThenCompare(5) [ default-this.scala:11 ]
4+
|Cannot prove that the value is fully initialized. Only initialized values may be used as arguments. Calling trace:
5+
| -> val result = updateThenCompare(5) [ default-this.scala:11 ]

tests/init/neg/promotion-loop.check

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
-- Error: tests/init/neg/promotion-loop.scala:16:10 --------------------------------------------------------------------
22
16 | println(b) // error
33
| ^
4-
| Cannot prove that the value is fully-initialized. May only use initialized value as arguments.
4+
| Cannot prove that the value is fully-initialized. Only initialized values may be used as arguments.
55
|
66
| The unsafe promotion may cause the following problem:
7-
| Cannot prove that the value is fully initialized. May only use initialized value as arguments.
7+
| Cannot prove that the value is fully initialized. Only initialized values may be used as arguments.

tests/init/neg/t3273.check

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
-- Error: tests/init/neg/t3273.scala:4:42 ------------------------------------------------------------------------------
22
4 | val num1: LazyList[Int] = 1 #:: num1.map(_ + 1) // error
33
| ^^^^^^^^^^^^^^^
4-
| Cannot prove that the value is fully-initialized. May only use initialized value as arguments.
4+
| Cannot prove that the value is fully-initialized. Only initialized values may be used as arguments.
55
|
66
| The unsafe promotion may cause the following problem:
77
| Access non-initialized value num1. Calling trace:
88
| -> val num1: LazyList[Int] = 1 #:: num1.map(_ + 1) // error [ t3273.scala:4 ]
99
-- Error: tests/init/neg/t3273.scala:5:61 ------------------------------------------------------------------------------
1010
5 | val num2: LazyList[Int] = 1 #:: num2.iterator.map(_ + 1).to(LazyList) // error
1111
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
12-
| Cannot prove that the value is fully-initialized. May only use initialized value as arguments.
12+
| Cannot prove that the value is fully-initialized. Only initialized values may be used as arguments.
1313
|
1414
| The unsafe promotion may cause the following problem:
1515
| Access non-initialized value num2. Calling trace:

0 commit comments

Comments
 (0)