Merge pull request scala#4839 from SethTisue/reword-dependent-type-error

SethTisue · SethTisue · commit c7040b6ac445 · 2015-11-14T09:18:57.000-05:00
less confusing wording for a dependent method type error
diff --git a/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala b/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala
@@ -1190,7 +1190,7 @@ trait ContextErrors {
 
       def IllegalDependentMethTpeError(sym: Symbol)(context: Context) = {
         val errorAddendum =
-          ": parameter appears in the type of another parameter in the same section or an earlier one"
+          ": parameter may only be referenced in a subsequent parameter section"
         issueSymbolTypeError(sym,  "illegal dependent method type" + errorAddendum)(context)
       }
 
diff --git a/test/files/neg/depmet_1.check b/test/files/neg/depmet_1.check
@@ -1,7 +1,7 @@
-depmet_1.scala:2: error: illegal dependent method type: parameter appears in the type of another parameter in the same section or an earlier one
+depmet_1.scala:2: error: illegal dependent method type: parameter may only be referenced in a subsequent parameter section
   def precise0(y: x.type)(x: String): Unit = {}
                           ^
-depmet_1.scala:3: error: illegal dependent method type: parameter appears in the type of another parameter in the same section or an earlier one
+depmet_1.scala:3: error: illegal dependent method type: parameter may only be referenced in a subsequent parameter section
   def precise1(x: String, y: x.type): Unit = {}
                ^
 depmet_1.scala:4: error: not found: value y

Original file line number	Diff line number	Diff line change
`@@ -1190,7 +1190,7 @@ trait ContextErrors {`
`1190`	`1190`
`1191`	`1191`	`def IllegalDependentMethTpeError(sym: Symbol)(context: Context) = {`
`1192`	`1192`	`val errorAddendum =`
`1193`		`- ": parameter appears in the type of another parameter in the same section or an earlier one"`
	`1193`	`+ ": parameter may only be referenced in a subsequent parameter section"`
`1194`	`1194`	`issueSymbolTypeError(sym, "illegal dependent method type" + errorAddendum)(context)`
`1195`	`1195`	`}`
`1196`	`1196`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`		`-depmet_1.scala:2: error: illegal dependent method type: parameter appears in the type of another parameter in the same section or an earlier one`
	`1`	`+depmet_1.scala:2: error: illegal dependent method type: parameter may only be referenced in a subsequent parameter section`
`2`	`2`	`def precise0(y: x.type)(x: String): Unit = {}`
`3`	`3`	`^`
`4`		`-depmet_1.scala:3: error: illegal dependent method type: parameter appears in the type of another parameter in the same section or an earlier one`
	`4`	`+depmet_1.scala:3: error: illegal dependent method type: parameter may only be referenced in a subsequent parameter section`
`5`	`5`	`def precise1(x: String, y: x.type): Unit = {}`
`6`	`6`	`^`
`7`	`7`	`depmet_1.scala:4: error: not found: value y`