Merge pull request scala#7154 from xuwei-k/Either-Projection

fix Either Projection warnings

Author: xuwei-k

src/compiler/scala/tools/nsc/backend/jvm/opt/ClosureOptimizer.scala

@@ -177,7 +177,7 @@ abstract class ClosureOptimizer {
           case _            => Right(prodCons.frameAt(invocation).getStackSize)
         }
 
-        stackSize.right.map((invocation, _))
+        stackSize.map((invocation, _))
     }).toList
   }
 

src/compiler/scala/tools/nsc/backend/jvm/opt/InlinerHeuristics.scala

@@ -166,7 +166,7 @@ abstract class InlinerHeuristics extends PerRunInit {
             postCall.flatMap(call => {
               callGraph.addIfMissing(callee.callee, callee.calleeDeclarationClass)
               val maybeCallsite = callGraph.findCallSite(callee.callee, call)
-              maybeCallsite.flatMap(requestIfCanInline(_, reason).flatMap(_.right.toOption))
+              maybeCallsite.flatMap(requestIfCanInline(_, reason).flatMap(_.toOption))
             }).toList
           }
           Some(Right(InlineRequest(callsite, postInlineRequest, reason)))

src/interactive/scala/tools/nsc/interactive/Main.scala

@@ -21,7 +21,7 @@ object Main extends nsc.MainClass {
       val reloaded = new interactive.Response[Unit]
       compiler.askReload(sfs, reloaded)
 
-      reloaded.get.right.toOption match {
+      reloaded.get.toOption match {
         case Some(ex) => reporter.ERROR.count += 1 // Causes exit code to be non-0
         case None     => reporter.reset()          // Causes other compiler errors to be ignored
       }