diff options
| author | Paul Phillips <paulp@improving.org> | 2012-09-20 09:58:20 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-09-20 09:58:46 -0700 |
| commit | 08de8afde6c99fb1739eb9730e6fce4eef54f296 (patch) | |
| tree | 30b73fcb7e97ac945a43d18c370bb4d2aa7d6949 /test/pending | |
| parent | e4e8578c5cf433648fa5428bfb2ad2ce8d347439 (diff) | |
| download | scala-08de8afde6c99fb1739eb9730e6fce4eef54f296.tar.gz scala-08de8afde6c99fb1739eb9730e6fce4eef54f296.tar.bz2 scala-08de8afde6c99fb1739eb9730e6fce4eef54f296.zip | |
Normalized line endings.
This brings all the files into line with the .gitattributes
settings, which should henceforth be automatically maintained
by git.
Diffstat (limited to 'test/pending')
5 files changed, 18 insertions, 18 deletions
diff --git a/test/pending/neg/macro-invalidusage-badbounds-b.check b/test/pending/neg/macro-invalidusage-badbounds-b.check index fd0b64533e..277f407d38 100644 --- a/test/pending/neg/macro-invalidusage-badbounds-b.check +++ b/test/pending/neg/macro-invalidusage-badbounds-b.check @@ -1,4 +1,4 @@ -Macros_Test_2.scala:7: error: type arguments [Int] do not conform to macro method foo's type parameter bounds [U <: String]
- foo[Int]
- ^
-one error found
+Macros_Test_2.scala:7: error: type arguments [Int] do not conform to macro method foo's type parameter bounds [U <: String] + foo[Int] + ^ +one error found diff --git a/test/pending/neg/reify_packed.check b/test/pending/neg/reify_packed.check index adba330d56..f26b902896 100644 --- a/test/pending/neg/reify_packed.check +++ b/test/pending/neg/reify_packed.check @@ -1,4 +1,4 @@ -reify_packed.scala:6: error: implementation restriction: cannot reify block of type List[_$1] that involves a type declared inside the block being reified. consider casting the return value to a suitable type.
- reify {
- ^
-one error found
+reify_packed.scala:6: error: implementation restriction: cannot reify block of type List[_$1] that involves a type declared inside the block being reified. consider casting the return value to a suitable type. + reify { + ^ +one error found diff --git a/test/pending/run/macro-expand-implicit-macro-defeats-type-inference.check b/test/pending/run/macro-expand-implicit-macro-defeats-type-inference.check index 5af32f38e0..e7cb9c367b 100644 --- a/test/pending/run/macro-expand-implicit-macro-defeats-type-inference.check +++ b/test/pending/run/macro-expand-implicit-macro-defeats-type-inference.check @@ -1,6 +1,6 @@ -openImplicits are: List()
-enclosingImplicits are: List((List[Int],scala.this.Predef.implicitly[List[Int]]))
-typetag is: TypeTag[Nothing]
-openImplicits are: List()
-enclosingImplicits are: List((List[String],Test.this.bar[String]))
-typetag is: TypeTag[Nothing]
+openImplicits are: List() +enclosingImplicits are: List((List[Int],scala.this.Predef.implicitly[List[Int]])) +typetag is: TypeTag[Nothing] +openImplicits are: List() +enclosingImplicits are: List((List[String],Test.this.bar[String])) +typetag is: TypeTag[Nothing] diff --git a/test/pending/run/macro-reify-tagless-b.check b/test/pending/run/macro-reify-tagless-b.check index 49acd94ad6..61ebb4e547 100644 --- a/test/pending/run/macro-reify-tagless-b.check +++ b/test/pending/run/macro-reify-tagless-b.check @@ -1,3 +1,3 @@ error: macro must not return an expr that contains free type variables (namely: T). have you forgot to use c.TypeTag annotations for type parameters external to a reifee? -
-java.lang.Error: reflective compilation has failed
+ +java.lang.Error: reflective compilation has failed diff --git a/test/pending/run/macro-reify-typetag-hktypeparams-notags.check b/test/pending/run/macro-reify-typetag-hktypeparams-notags.check index db8a19d5f7..53acc9184c 100644 --- a/test/pending/run/macro-reify-typetag-hktypeparams-notags.check +++ b/test/pending/run/macro-reify-typetag-hktypeparams-notags.check @@ -1,2 +1,2 @@ -TypeTag(C[T])
-TypeTag(List[C[T]])
+TypeTag(C[T]) +TypeTag(List[C[T]]) |