diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2016-03-18 12:47:04 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2016-03-26 22:54:06 -0700 |
| commit | a2795ba77c0e7b56b0a522eae0cca298af0ac1f1 (patch) | |
| tree | 1f61a36b02847fda77db7c85ddaf47a5220cb540 /src/compiler/scala/reflect/reify | |
| parent | 5f71e2e43b526c197ce4b8efaa85df101bef4fc4 (diff) | |
| download | scala-a2795ba77c0e7b56b0a522eae0cca298af0ac1f1.tar.gz scala-a2795ba77c0e7b56b0a522eae0cca298af0ac1f1.tar.bz2 scala-a2795ba77c0e7b56b0a522eae0cca298af0ac1f1.zip | |
Refactoring. Simplify inferImplicit's boolean levers
Diffstat (limited to 'src/compiler/scala/reflect/reify')
| -rw-r--r-- | src/compiler/scala/reflect/reify/codegen/GenTypes.scala | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/compiler/scala/reflect/reify/codegen/GenTypes.scala b/src/compiler/scala/reflect/reify/codegen/GenTypes.scala index d007df75e3..b2948f8161 100644 --- a/src/compiler/scala/reflect/reify/codegen/GenTypes.scala +++ b/src/compiler/scala/reflect/reify/codegen/GenTypes.scala @@ -106,14 +106,10 @@ trait GenTypes { private def spliceAsManifest(tpe: Type): Tree = { def isSynthetic(manifest: Tree) = manifest exists (sub => sub.symbol != null && (sub.symbol == FullManifestModule || sub.symbol.owner == FullManifestModule)) def searchForManifest(typer: analyzer.Typer): Tree = - analyzer.inferImplicit( - EmptyTree, + analyzer.inferImplicitByTypeSilent( appliedType(FullManifestClass.toTypeConstructor, List(tpe)), - reportAmbiguous = false, - isView = false, - context = typer.context, - saveAmbiguousDivergent = false, - pos = defaultErrorPosition) match { + typer.context, + defaultErrorPosition) match { case success if !success.tree.isEmpty && !isSynthetic(success.tree) => val manifestInScope = success.tree // todo. write a test for this |