diff --git a/main/src/main/scala/sbt/internal/graph/backend/IvyReport.scala b/main/src/main/scala/sbt/internal/graph/backend/IvyReport.scala index 99270b939..07fb20312 100644 --- a/main/src/main/scala/sbt/internal/graph/backend/IvyReport.scala +++ b/main/src/main/scala/sbt/internal/graph/backend/IvyReport.scala @@ -20,13 +20,13 @@ object IvyReport { def fromReportXML(doc: Document): ModuleGraph = { def edgesForModule(id: GraphModuleId, revision: NodeSeq): Seq[Edge] = for { - caller ← revision \ "caller" + caller <- revision \ "caller" callerModule = moduleIdFromElement(caller, caller.attribute("callerrev").get.text) } yield (moduleIdFromElement(caller, caller.attribute("callerrev").get.text), id) val moduleEdges: Seq[(Module, Seq[Edge])] = for { - mod ← doc \ "dependencies" \ "module" - revision ← mod \ "revision" + mod <- doc \ "dependencies" \ "module" + revision <- mod \ "revision" rev = revision.attribute("name").get.text moduleId = moduleIdFromElement(mod, rev) module = Module( diff --git a/main/src/main/scala/sbt/internal/graph/rendering/DOT.scala b/main/src/main/scala/sbt/internal/graph/rendering/DOT.scala index 6c984f1ca..2c7c428fa 100644 --- a/main/src/main/scala/sbt/internal/graph/rendering/DOT.scala +++ b/main/src/main/scala/sbt/internal/graph/rendering/DOT.scala @@ -20,7 +20,7 @@ object DOT { labelRendering: HTMLLabelRendering ): String = { val nodes = { - for (n ← graph.nodes) yield { + for (n <- graph.nodes) yield { val style = if (n.isEvicted) EvictedStyle else "" val label = nodeFormation(n.id.organization, n.id.name, n.id.version) """ "%s"[%s style="%s"]""".format( @@ -56,7 +56,7 @@ object DOT { .filterNot(e => originWasEvicted(e) || evictionTargetEdges(e)) ++ evictedByEdges val edges = { - for (e ← filteredEdges) yield { + for (e <- filteredEdges) yield { val extra = if (graph.module(e._1).isEvicted) s""" [label="Evicted By" style="$EvictedStyle"]""" diff --git a/main/src/main/scala/sbt/internal/graph/rendering/GraphML.scala b/main/src/main/scala/sbt/internal/graph/rendering/GraphML.scala index 024d3c6bd..9f61873dc 100644 --- a/main/src/main/scala/sbt/internal/graph/rendering/GraphML.scala +++ b/main/src/main/scala/sbt/internal/graph/rendering/GraphML.scala @@ -15,7 +15,7 @@ import scala.xml.XML object GraphML { def saveAsGraphML(graph: ModuleGraph, outputFile: String): Unit = { val nodesXml = - for (n ← graph.nodes) + for (n <- graph.nodes) yield {n.id.idString} @@ -23,7 +23,7 @@ object GraphML { val edgesXml = - for (e ← graph.edges) + for (e <- graph.edges) yield val xml =