diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2015-07-13 08:42:11 +1000 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2015-07-13 11:45:02 +1000 |
commit | 18e3e61778918e4e802b8fb75789635409523372 (patch) | |
tree | 18d67da301f0b63667e9393d3e336b1fcb5e1875 /test/files/scalacheck/quasiquotes/DefinitionConstructionProps.scala | |
parent | b92c3aff1ab8c76c4816bd7b1a82a0f87d787837 (diff) | |
parent | 52fde52920d93325310e5544991feeea03e5c763 (diff) | |
download | scala-18e3e61778918e4e802b8fb75789635409523372.tar.gz scala-18e3e61778918e4e802b8fb75789635409523372.tar.bz2 scala-18e3e61778918e4e802b8fb75789635409523372.zip |
Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-20150713
Conflicts:
src/eclipse/partest/.classpath
src/eclipse/repl/.classpath
test/files/run/nothingTypeNoFramesNoDce.scala
test/files/run/repl-javap-app.check
Also fixup two .classpath files with updated partest, xml and
parser combinators JARs.
Diffstat (limited to 'test/files/scalacheck/quasiquotes/DefinitionConstructionProps.scala')
-rw-r--r-- | test/files/scalacheck/quasiquotes/DefinitionConstructionProps.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/files/scalacheck/quasiquotes/DefinitionConstructionProps.scala b/test/files/scalacheck/quasiquotes/DefinitionConstructionProps.scala index fd810674f5..4ab8bb8531 100644 --- a/test/files/scalacheck/quasiquotes/DefinitionConstructionProps.scala +++ b/test/files/scalacheck/quasiquotes/DefinitionConstructionProps.scala @@ -346,7 +346,7 @@ trait MethodConstruction { self: QuasiquoteProperties => } } - property("can't unquote annotations with arguments specificed twice") = test { + property("can't unquote annotations with arguments specified twice") = test { val a = q"new a(x)" assertThrows[IllegalArgumentException] { q"@$a(y) def foo" @@ -370,7 +370,7 @@ trait PackageConstruction { self: QuasiquoteProperties => assertEqAst(q"package $name { }", "package foo.bar { }") } - property("splce name into package name") = test{ + property("splice name into package name") = test{ val name = TermName("bippy") assertEqAst(q"package $name { }", "package bippy { }") } |