diff options
| author | Paul Phillips <paulp@improving.org> | 2012-09-28 06:55:49 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-09-28 07:19:01 -0700 |
| commit | 886c4061222773d76f3ee3f4ff1469f9d4a48eaf (patch) | |
| tree | 70b13842e325bafd48e5494c844078f35b02f5b7 /test/files/neg/unchecked.check | |
| parent | 41f37bc428a309b9766f545da0179f270ea01d77 (diff) | |
| parent | 57db28c55c3610f508b07940f7077cb73932418f (diff) | |
| download | scala-886c4061222773d76f3ee3f4ff1469f9d4a48eaf.tar.gz scala-886c4061222773d76f3ee3f4ff1469f9d4a48eaf.tar.bz2 scala-886c4061222773d76f3ee3f4ff1469f9d4a48eaf.zip | |
Merge branch '2.10.x' into 210-merge
* 2.10.x: (37 commits)
Added logic and tests for unchecked refinements.
Moved isNonRefinementClassType somewhere logical.
Moved two tests to less breaky locations.
Nailed down the "impossible match" logic.
Finish docs for string interpolation.
moves Context.ParseError outside the cake
revives macros.Infrastructure
moves Context.runtimeUniverse to TreeBuild.mkRuntimeUniverseRef
a more precise type for Context.mirror
gets rid of macros.Infrastructure
simplifies Context.Run and Context.CompilationUnit
exposes Position.source as SourceFile
removes extraneous stuff from macros.Infrastructure
merges macros.CapturedVariables into macros.Universe
merges macros.Exprs and macros.TypeTags into Context
removes front ends from scala-reflect.jar
PositionApi => Position
hides BuildUtils from Scaladoc
MirrorOf => Mirror
docs.pre-lib now checks for mods in reflect
...
Conflicts:
test/files/neg/t4302.check
test/files/neg/unchecked.check
test/files/neg/unchecked2.check
Diffstat (limited to 'test/files/neg/unchecked.check')
| -rw-r--r-- | test/files/neg/unchecked.check | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/neg/unchecked.check b/test/files/neg/unchecked.check index 19b8c908da..570f02f219 100644 --- a/test/files/neg/unchecked.check +++ b/test/files/neg/unchecked.check @@ -2,7 +2,7 @@ unchecked.scala:18: warning: non-variable type argument String in type pattern I case xs: Iterable[String] => xs.head // unchecked ^ unchecked.scala:22: warning: non-variable type argument Any in type pattern Set[Any] is unchecked since it is eliminated by erasure - case xs: Set[Any] => xs.head // unchecked + case xs: Set[Any] => xs.head // unchecked ^ unchecked.scala:26: warning: non-variable type argument Any in type pattern Map[Any,Any] is unchecked since it is eliminated by erasure case xs: Map[Any, Any] => xs.head // unchecked |