Skip to content

Commit

Permalink
Update scalafmt-core to 2.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
BenFradet committed Jun 24, 2020
1 parent 130ab8a commit 00ab7df
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version=2.6.0
version=2.6.1
style = defaultWithAlign
maxColumn = 100

Expand Down
3 changes: 2 additions & 1 deletion src/main/scala/stdlib/Asserts.scala
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ object Asserts extends AnyFlatSpec with Matchers with org.scalaexercises.definit
v1 shouldEqual res0

/**
* `shouldEqual` is an assertion. It is from ScalaTest, not from the Scala language. */
* `shouldEqual` is an assertion. It is from ScalaTest, not from the Scala language.
*/
}

/**
Expand Down
3 changes: 2 additions & 1 deletion src/main/scala/stdlib/Iterables.scala
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,8 @@ object Iterables extends AnyFlatSpec with Matchers with org.scalaexercises.defin
val yt1 = Set(3, 2, 1)
xt1.iterator.sameElements(yt1) should be(res3) // Caution - see below!
/**
* Note that very small Sets (containing up to 4 elements) are implemented differently to larger Sets; as a result, their iterators produce the elements in the order that they were originally added. This causes the surprising (and arguably incorrect) behaviour in the final example above. */
* Note that very small Sets (containing up to 4 elements) are implemented differently to larger Sets; as a result, their iterators produce the elements in the order that they were originally added. This causes the surprising (and arguably incorrect) behaviour in the final example above.
*/
}

}
3 changes: 2 additions & 1 deletion src/main/scala/stdlib/Options.scala
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,8 @@ object Options extends AnyFlatSpec with Matchers with org.scalaexercises.definit
result2 should be(res1)

/**
* Note that the type of result1 is now Option[Double], thanks to the scala type inference. */
* Note that the type of result1 is now Option[Double], thanks to the scala type inference.
*/
}

/**
Expand Down

0 comments on commit 00ab7df

Please sign in to comment.