Skip to content

Commit db9837b

Browse files
committed
Merge remote-tracking branch 'origin/main' into scala-ides
2 parents 2f89e7c + 482685d commit db9837b

38 files changed

+3523
-124
lines changed

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,8 +251,8 @@ GEM
251251
rb-fsevent (0.11.2)
252252
rb-inotify (0.10.1)
253253
ffi (~> 1.0)
254-
rexml (3.2.8)
255-
strscan (>= 3.0.9)
254+
rexml (3.3.6)
255+
strscan
256256
rouge (3.30.0)
257257
ruby2_keywords (0.0.5)
258258
rubyzip (2.3.2)

_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ keywords:
1717

1818
scala-version: 2.13.14
1919
scala-212-version: 2.12.19
20-
scala-3-version: 3.4.2
20+
scala-3-version: 3.5.0
2121

2222
collections:
2323
style:

_data/compiler-options.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -469,10 +469,6 @@
469469
schema:
470470
type: "Boolean"
471471
description: "Don't perform exhaustivity/unreachability analysis. Also, ignore @switch annotation."
472-
- option: "-Xno-uescape"
473-
schema:
474-
type: "Boolean"
475-
description: "Disable handling of \\u unicode escapes."
476472
- option: "-Xnojline"
477473
schema:
478474
type: "Boolean"

_includes/_markdown/install-munit.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,14 @@ Alternatively, you can require just a specific version of MUnit:
1616
{% tab 'sbt' %}
1717
In your build.sbt file, you can add the dependency on toolkit-test:
1818
```scala
19-
lazy val example = project.in(file("example"))
19+
lazy val example = project.in(file("."))
2020
.settings(
2121
scalaVersion := "3.3.3",
2222
libraryDependencies += "org.scala-lang" %% "toolkit-test" % "0.1.7" % Test
2323
)
2424
```
25-
Here the `Test` configuration means that the dependency is only used by the source files in `example/src/test`.
25+
26+
Here the `Test` configuration means that the dependency is only used by the source files in `src/test`.
2627

2728
Alternatively, you can require just a specific version of MUnit:
2829
```scala

_includes/_markdown/install-os-lib.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Alternatively, you can require just a specific version of OS-Lib:
1515
{% tab 'sbt' %}
1616
In your `build.sbt`, you can add a dependency on the toolkit:
1717
```scala
18-
lazy val example = project.in(file("example"))
18+
lazy val example = project.in(file("."))
1919
.settings(
2020
scalaVersion := "3.3.3",
2121
libraryDependencies += "org.scala-lang" %% "toolkit" % "0.1.7"

_includes/_markdown/install-sttp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Alternatively, you can require just a specific version of sttp:
1515
{% tab 'sbt' %}
1616
In your build.sbt file, you can add a dependency on the Toolkit:
1717
```scala
18-
lazy val example = project.in(file("example"))
18+
lazy val example = project.in(file("."))
1919
.settings(
2020
scalaVersion := "3.3.3",
2121
libraryDependencies += "org.scala-lang" %% "toolkit" % "0.1.7"

_includes/_markdown/install-upickle.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Alternatively, you can require just a specific version of UPickle:
1515
{% tab 'sbt' %}
1616
In your build.sbt file, you can add the dependency on the Toolkit:
1717
```scala
18-
lazy val example = project.in(file("example"))
18+
lazy val example = project.in(file("."))
1919
.settings(
2020
scalaVersion := "3.3.3",
2121
libraryDependencies += "org.scala-lang" %% "toolkit" % "0.1.7"

_overviews/FAQ/index.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,15 @@ for multiple reasons, most notoriously
273273
For an in-depth treatment of types vs. classes, see the blog post
274274
["There are more types than classes"](https://typelevel.org/blog/2017/02/13/more-types-than-classes.html).
275275

276+
### Should I declare my parameterless method with or without parentheses?
277+
278+
In other words, should one write `def foo()` or just `def foo`?
279+
280+
Answer: by convention, the former is used to indicate that a method
281+
has side effects.
282+
283+
For more details, see the Scala Style Guide, [here](https://docs.scala-lang.org/style/naming-conventions.html#parentheses).
284+
276285
### How can a method in a superclass return a value of the “current” type?
277286

278287
First, note that using `this.type` won't work. People often try that,

_overviews/collections-2.13/trait-iterable.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ res7: List[Int] = List(3, 4, 5)
133133
| `xs.count(p)` |The number of elements in `xs` that satisfy the predicate `p`.|
134134
| **Folds:** | |
135135
| `xs.foldLeft(z)(op)` |Apply binary operation `op` between successive elements of `xs`, going left to right and starting with `z`.|
136-
| `xs.foldRight(z)(op)` |Apply binary operation `op` between successive elements of `xs`, going right to left and ending with `z`.|
136+
| `xs.foldRight(z)(op)` |Apply binary operation `op` between successive elements of `xs`, going right to left and starting with `z`.|
137137
| `xs.reduceLeft(op)` |Apply binary operation `op` between successive elements of non-empty collection `xs`, going left to right.|
138138
| `xs.reduceRight(op)` |Apply binary operation `op` between successive elements of non-empty collection `xs`, going right to left.|
139139
| **Specific Folds:** | |

_overviews/core/implicit-classes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Implicit classes have the following restrictions:
7777
**2. They may only take one non-implicit argument in their constructor.**
7878

7979

80-
implicit class RichDate(date: java.util.Date) // OK!
80+
implicit class RichDate(date: java.time.LocalDate) // OK!
8181
implicit class Indexer[T](collection: Seq[T], index: Int) // BAD!
8282
implicit class Indexer[T](collection: Seq[T])(implicit index: Index) // OK!
8383

0 commit comments

Comments
 (0)