From db53fa774003cc013078992d8b71384acd02ce77 Mon Sep 17 00:00:00 2001 From: Meriam Lachkar Date: Mon, 12 Oct 2020 12:59:23 +0200 Subject: [PATCH] add Xfatal-warnings to docs project --- build.sbt | 3 ++- scalafix-docs/src/main/scala/docs/website.scala | 6 ++++-- scalafix-docs/src/main/scala/scalafix/docs/PatchDocs.scala | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index 95d8089e7..7afdb184b 100644 --- a/build.sbt +++ b/build.sbt @@ -283,7 +283,8 @@ lazy val docs = project skip in publish := true, moduleName := "scalafix-docs", scalaVersion := scala213, - scalacOptions += "-Wconf:msg='match may not be exhaustive':ws", // silence exhaustive pattern matching warning for documentation + scalacOptions += "-Wconf:msg='match may not be exhaustive':s", // silence exhaustive pattern matching warning for documentation + scalacOptions += "-Xfatal-warnings", mdoc := run.in(Compile).evaluated, crossScalaVersions := List(scala213), libraryDependencies ++= List( diff --git a/scalafix-docs/src/main/scala/docs/website.scala b/scalafix-docs/src/main/scala/docs/website.scala index 0af487124..cecc8ed98 100644 --- a/scalafix-docs/src/main/scala/docs/website.scala +++ b/scalafix-docs/src/main/scala/docs/website.scala @@ -84,14 +84,16 @@ package object website { default: T )(implicit settings: Settings[T], ev: T <:< Product): List[(Setting, Any)] = { settings.settings - .zip(default.productIterator.toIterable) + .zip(default.productIterator.iterator.to(Iterable)) .filterNot { case (setting, _) => setting.isHidden } .flatMap { case (s, d: SimpleDefinitions) => (s, d.kinds.mkString("['", "', '", "']")) :: Nil case (deepSetting, defaultSetting: Product) if deepSetting.underlying.nonEmpty => - deepSetting.flat.zip(defaultSetting.productIterator.toIterable) + deepSetting.flat.zip( + defaultSetting.productIterator.iterator.to(Iterable) + ) case (s, lst: Iterable[_]) => val rendered = lst.map(render) val string = diff --git a/scalafix-docs/src/main/scala/scalafix/docs/PatchDocs.scala b/scalafix-docs/src/main/scala/scalafix/docs/PatchDocs.scala index 99f9bd640..93affa7b6 100644 --- a/scalafix-docs/src/main/scala/scalafix/docs/PatchDocs.scala +++ b/scalafix-docs/src/main/scala/scalafix/docs/PatchDocs.scala @@ -28,7 +28,7 @@ object PatchDocs { doc .nested(ctx.indentCount * ctx.indentStep) .renderStream(ctx.leftOffset) - .toIterator + .iterator } x match { case t: SemanticTree =>