Skip to content

Update scalafmt-core to 2.6.1 #205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 24, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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