Skip to content
This repository was archived by the owner on Mar 27, 2025. It is now read-only.

Commit 2f5f4fe

Browse files
authored
Fix some typos and clarify a couple of sentences (#128)
1 parent 0a58fae commit 2f5f4fe

File tree

41 files changed

+71
-71
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+71
-71
lines changed

README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ need to be installed:
2525
* The `cmtc` Course Management Tools Client CLI
2626
* An IDE
2727

28-
The following sections detail how these components.
28+
The following sections detail how to install these components.
2929

3030
### Install Coursier
3131

@@ -122,7 +122,7 @@ Exercises in repository:
122122
123123
#### Verifying the course installation
124124
125-
Verify that the the course was installed correctly by launching `sbt test` in the root folder of the
125+
Verify that the course was installed correctly by launching `sbt test` in the root folder of the
126126
course exercises. You should see the following output:
127127
128128
```bash
@@ -199,7 +199,7 @@ As can be seen in the above output, `cmtc` installed the course in the `/Users/e
199199
200200
#### Verifying the course installation
201201
202-
Verify that the the course was installed correctly by launching `sbt test` in the root folder of the
202+
Verify that the course was installed correctly by launching `sbt test` in the root folder of the
203203
course exercises. You should see the following output:
204204
205205
```bash
@@ -228,13 +228,13 @@ org.lunatechlabs.dotty.sudoku.ReductionRuleSuite:
228228
+ Applying reduction rules should eliminate values in isolated complete sets from occurrences in other cells (First reduction rule) 0.045s
229229
+ Applying reduction rules should eliminate values in isolated complete sets of 5 values from occurrences in other cells (First reduction rule) 0.001s
230230
+ Applying reduction rules should eliminate values in 2 isolated complete sets of 3 values from occurrences in other cells (First reduction rule) 0.001s
231-
+ Applying reduction rules should eliminate values in shadowed complete sets from occurrences in same cells (Second reduction rule) 0.001s
232-
+ Applying reduction rules should eliminate values in shadowed complete (6 value) sets from occurrences in same cells (Second reduction rule) 0.001s
231+
+ Applying reduction rules should eliminate values in shadowed complete sets from occurrences in the same cells (Second reduction rule) 0.001s
232+
+ Applying reduction rules should eliminate values in shadowed complete (6 value) sets from occurrences in the same cells (Second reduction rule) 0.001s
233233
SLF4J: A number (1) of logging calls during the initialization phase have been intercepted and are
234234
SLF4J: now being replayed. These are subject to the filtering rules of the underlying logging system.
235235
SLF4J: See also http://www.slf4j.org/codes.html#replay
236236
org.lunatechlabs.dotty.sudoku.SudokuDetailProcessorSuite:
237-
+ Sending no updates to a sudoku detail processor should result in sending a SudokuDetailUnchanged messsage 0.007s
237+
+ Sending no updates to a sudoku detail processor should result in sending a SudokuDetailUnchanged message 0.007s
238238
+ Sending an update to a fresh instance of the SudokuDetailProcessor that sets one cell to a single value should result in sending an update that reflects this update 0.002s
239239
+ Sending a series of subsequent Updates to a SudokuDetailProcessor should result in sending updates and ultimately return no changes 0.003s
240240
[info] Passed: Total 11, Failed 0, Errors 0, Passed 11

exercises/exercise_000_sudoku_solver_initial_state/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ SLF4J: now being replayed. These are subject to the filtering rules of the under
5555
SLF4J: See also http://www.slf4j.org/codes.html#replay
5656
[info] SudokuDetailProcessorSpec:
5757
[info] Sending no updates to a sudoku detail processor
58-
[info] - should result in sending a SudokuDetailUnchanged messsage
58+
[info] - should result in sending a SudokuDetailUnchanged message
5959
[info] Sending an update to a fresh instance of the SudokuDetailProcessor that sets one cell to a single value
6060
[info] - should result in sending an update that reflects this update
6161
[info] Sending a series of subsequent Updates to a SudokuDetailProcessor
@@ -65,8 +65,8 @@ SLF4J: See also http://www.slf4j.org/codes.html#replay
6565
[info] - should Eliminate values in isolated complete sets from occurrences in other cells (First reduction rule)
6666
[info] - should Eliminate values in isolated complete sets of 5 values from occurrences in other cells (First reduction rule)
6767
[info] - should Eliminate values in 2 isolated complete sets of 3 values from occurrences in other cells (First reduction rule)
68-
[info] - should Eliminate values in shadowed complete sets from occurrences in same cells (Second reduction rule)
69-
[info] - should Eliminate values in shadowed complete (6 value) sets from occurrences in same cells (Second reduction rule)
68+
[info] - should Eliminate values in shadowed complete sets from occurrences in the same cells (Second reduction rule)
69+
[info] - should Eliminate values in shadowed complete (6 value) sets from occurrences in the same cells (Second reduction rule)
7070
[info] CellMappingSpec:
7171
[info] Mapping row coordinates
7272
[info] - should result in correct column & block coordinates

exercises/exercise_000_sudoku_solver_initial_state/src/test/scala/org/lunatechlabs/dotty/sudoku/ReductionRuleSuite.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ class ReductionRuleSuite extends munit.FunSuite with SudokuTestHelpers {
128128
}
129129

130130
test(
131-
"Applying reduction rules should eliminate values in shadowed complete sets from occurrences in same cells (Second reduction rule)") {
131+
"Applying reduction rules should eliminate values in shadowed complete sets from occurrences in the same cells (Second reduction rule)") {
132132
val input = stringToReductionSet(
133133
Vector(
134134
"12 5 789", // (1,2,7,8) shadowed & complete
@@ -160,7 +160,7 @@ class ReductionRuleSuite extends munit.FunSuite with SudokuTestHelpers {
160160
}
161161

162162
test(
163-
"Applying reduction rules should eliminate values in shadowed complete (6 value) sets from occurrences in same cells (Second reduction rule)") {
163+
"Applying reduction rules should eliminate values in shadowed complete (6 value) sets from occurrences in the same cells (Second reduction rule)") {
164164
val input = stringToReductionSet(
165165
Vector(
166166
"123456 89", // (1,2,3,4,5,6) shadowed & complete

exercises/exercise_000_sudoku_solver_initial_state/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class SudokuDetailProcessorSuite extends munit.FunSuite with SudokuTestHelpers {
1212
testKit.shutdownTestKit()
1313
}
1414

15-
test("Sending no updates to a sudoku detail processor should result in sending a SudokuDetailUnchanged messsage") {
15+
test("Sending no updates to a sudoku detail processor should result in sending a SudokuDetailUnchanged message") {
1616

1717
val probe = testKit.createTestProbe[SudokuDetailProcessor.Response]()
1818
val detailProcessor = testKit.spawn(SudokuDetailProcessor[Row](id = 0))

exercises/exercise_001_dotty_deprecated_syntax_rewriting/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ where possible standard options include:
8787
-source source version
8888
```
8989

90-
We will add some code that trigger a number of compiler warnings which can
90+
We will add some code that triggers a number of compiler warnings which can
9191
be corrected by the compiler's code rewriting capabilities.
9292

9393
Add the following code snippet to the `src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala` source code file:
@@ -147,7 +147,7 @@ wildcard import syntax from using an asterix (`*`) instead of an underscore (`_`
147147
- Add the "-rewrite" option to have the compiler apply all the reported
148148
changes.
149149
- The end result should be that, after the compiler has applied its rewrites, the source code
150-
compiles clean.
150+
compiles successfully.
151151
- Remove the `-rewrite` from `scalacOptions` in the sbt build definition.
152152
- Checkpoint the current state of your code by commiting the changes to git:
153153

exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/test/scala/org/lunatechlabs/dotty/sudoku/ReductionRuleSuite.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ class ReductionRuleSuite extends munit.FunSuite with SudokuTestHelpers {
128128
}
129129

130130
test(
131-
"Applying reduction rules should eliminate values in shadowed complete sets from occurrences in same cells (Second reduction rule)") {
131+
"Applying reduction rules should eliminate values in shadowed complete sets from occurrences in the same cells (Second reduction rule)") {
132132
val input = stringToReductionSet(
133133
Vector(
134134
"12 5 789", // (1,2,7,8) shadowed & complete
@@ -160,7 +160,7 @@ class ReductionRuleSuite extends munit.FunSuite with SudokuTestHelpers {
160160
}
161161

162162
test(
163-
"Applying reduction rules should eliminate values in shadowed complete (6 value) sets from occurrences in same cells (Second reduction rule)") {
163+
"Applying reduction rules should eliminate values in shadowed complete (6 value) sets from occurrences in the same cells (Second reduction rule)") {
164164
val input = stringToReductionSet(
165165
Vector(
166166
"123456 89", // (1,2,3,4,5,6) shadowed & complete

exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class SudokuDetailProcessorSuite extends munit.FunSuite with SudokuTestHelpers {
1212
testKit.shutdownTestKit()
1313
}
1414

15-
test("Sending no updates to a sudoku detail processor should result in sending a SudokuDetailUnchanged messsage") {
15+
test("Sending no updates to a sudoku detail processor should result in sending a SudokuDetailUnchanged message") {
1616

1717
val probe = testKit.createTestProbe[SudokuDetailProcessor.Response]()
1818
val detailProcessor = testKit.spawn(SudokuDetailProcessor[Row](id = 0))

exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Scala 3 introduces some new syntax which can be divided in two categories:
1111

1212
The Scala 3 compiler is able to rewrite existing source code to a different syntax.
1313
Note that this rewriting is done one step at a time. In other words, rewriting to
14-
the new significant indentation based syntax -and- to the new control structure syntax
14+
the new significant indentation based syntax _and_ to the new control structure syntax
1515
cannot be done in a single step.
1616

1717
Changing the syntax is a reversible process (except that after going back to where
@@ -42,7 +42,7 @@ alternative syntax options.
4242
for a specific syntax rewrite.
4343
- Note that syntax rewrites have to be executed one at a time. Also, consecutive
4444
syntax rewrites have to be executed in a certain order. Make sure you understand
45-
what's explained in the section named `Setting and Rewrites` at the end of the
45+
what's explained in the section named `Settings and Rewrites` at the end of the
4646
[Optional Braces](https://dotty.epfl.ch/docs/reference/other-new-features/indentation.html)
4747
section in the Scala 3 reference documentation.
4848

exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/test/scala/org/lunatechlabs/dotty/sudoku/ReductionRuleSuite.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class ReductionRuleSuite extends munit.FunSuite with SudokuTestHelpers:
124124
assertEquals(applyReductionRules(input), reducedInput)
125125

126126
test(
127-
"Applying reduction rules should eliminate values in shadowed complete sets from occurrences in same cells (Second reduction rule)"):
127+
"Applying reduction rules should eliminate values in shadowed complete sets from occurrences in the same cells (Second reduction rule)"):
128128
val input = stringToReductionSet(
129129
Vector(
130130
"12 5 789", // (1,2,7,8) shadowed & complete
@@ -155,7 +155,7 @@ class ReductionRuleSuite extends munit.FunSuite with SudokuTestHelpers:
155155
assertEquals(applyReductionRules(reducedInput1), reducedInput1)
156156

157157
test(
158-
"Applying reduction rules should eliminate values in shadowed complete (6 value) sets from occurrences in same cells (Second reduction rule)"):
158+
"Applying reduction rules should eliminate values in shadowed complete (6 value) sets from occurrences in the same cells (Second reduction rule)"):
159159
val input = stringToReductionSet(
160160
Vector(
161161
"123456 89", // (1,2,3,4,5,6) shadowed & complete

exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class SudokuDetailProcessorSuite extends munit.FunSuite with SudokuTestHelpers:
1111
override def afterAll(): Unit =
1212
testKit.shutdownTestKit()
1313

14-
test("Sending no updates to a sudoku detail processor should result in sending a SudokuDetailUnchanged messsage"):
14+
test("Sending no updates to a sudoku detail processor should result in sending a SudokuDetailUnchanged message"):
1515

1616
val probe = testKit.createTestProbe[SudokuDetailProcessor.Response]()
1717
val detailProcessor = testKit.spawn(SudokuDetailProcessor[Row](id = 0))

exercises/exercise_003_top_level_definitions/src/test/scala/org/lunatechlabs/dotty/sudoku/ReductionRuleSuite.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class ReductionRuleSuite extends munit.FunSuite with SudokuTestHelpers:
124124
assertEquals(applyReductionRules(input), reducedInput)
125125

126126
test(
127-
"Applying reduction rules should eliminate values in shadowed complete sets from occurrences in same cells (Second reduction rule)"):
127+
"Applying reduction rules should eliminate values in shadowed complete sets from occurrences in the same cells (Second reduction rule)"):
128128
val input = stringToReductionSet(
129129
Vector(
130130
"12 5 789", // (1,2,7,8) shadowed & complete
@@ -155,7 +155,7 @@ class ReductionRuleSuite extends munit.FunSuite with SudokuTestHelpers:
155155
assertEquals(applyReductionRules(reducedInput1), reducedInput1)
156156

157157
test(
158-
"Applying reduction rules should eliminate values in shadowed complete (6 value) sets from occurrences in same cells (Second reduction rule)"):
158+
"Applying reduction rules should eliminate values in shadowed complete (6 value) sets from occurrences in the same cells (Second reduction rule)"):
159159
val input = stringToReductionSet(
160160
Vector(
161161
"123456 89", // (1,2,3,4,5,6) shadowed & complete

exercises/exercise_003_top_level_definitions/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class SudokuDetailProcessorSuite extends munit.FunSuite with SudokuTestHelpers:
1111
override def afterAll(): Unit =
1212
testKit.shutdownTestKit()
1313

14-
test("Sending no updates to a sudoku detail processor should result in sending a SudokuDetailUnchanged messsage"):
14+
test("Sending no updates to a sudoku detail processor should result in sending a SudokuDetailUnchanged message"):
1515

1616
val probe = testKit.createTestProbe[SudokuDetailProcessor.Response]()
1717
val detailProcessor = testKit.spawn(SudokuDetailProcessor[Row](id = 0))

exercises/exercise_004_parameter_untupling/src/test/scala/org/lunatechlabs/dotty/sudoku/ReductionRuleSuite.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class ReductionRuleSuite extends munit.FunSuite with SudokuTestHelpers:
124124
assertEquals(applyReductionRules(input), reducedInput)
125125

126126
test(
127-
"Applying reduction rules should eliminate values in shadowed complete sets from occurrences in same cells (Second reduction rule)"):
127+
"Applying reduction rules should eliminate values in shadowed complete sets from occurrences in the same cells (Second reduction rule)"):
128128
val input = stringToReductionSet(
129129
Vector(
130130
"12 5 789", // (1,2,7,8) shadowed & complete
@@ -155,7 +155,7 @@ class ReductionRuleSuite extends munit.FunSuite with SudokuTestHelpers:
155155
assertEquals(applyReductionRules(reducedInput1), reducedInput1)
156156

157157
test(
158-
"Applying reduction rules should eliminate values in shadowed complete (6 value) sets from occurrences in same cells (Second reduction rule)"):
158+
"Applying reduction rules should eliminate values in shadowed complete (6 value) sets from occurrences in the same cells (Second reduction rule)"):
159159
val input = stringToReductionSet(
160160
Vector(
161161
"123456 89", // (1,2,3,4,5,6) shadowed & complete

exercises/exercise_004_parameter_untupling/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class SudokuDetailProcessorSuite extends munit.FunSuite with SudokuTestHelpers:
1111
override def afterAll(): Unit =
1212
testKit.shutdownTestKit()
1313

14-
test("Sending no updates to a sudoku detail processor should result in sending a SudokuDetailUnchanged messsage"):
14+
test("Sending no updates to a sudoku detail processor should result in sending a SudokuDetailUnchanged message"):
1515

1616
val probe = testKit.createTestProbe[SudokuDetailProcessor.Response]()
1717
val detailProcessor = testKit.spawn(SudokuDetailProcessor[Row](id = 0))

exercises/exercise_005_extension_methods/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ extension (i: Int)
4545
## Steps - part I
4646

4747
You should look for extension methods defined with the Scala 2 syntax. How would
48-
you approach this. As part of the exercise, you will define a few new extension
48+
you approach this? As part of the exercise, you will define a few new extension
4949
methods. In fact, for this exercise, the tests have been modified assuming these
5050
new extension methods are already present. Let's start with adapting the existing
51-
extension methods. Wait with running the tests until you start tackling the second
51+
extension methods. Hold running the tests until you start tackling the second
5252
part of this exercise (adding the new extension methods).
5353

5454
- Identify all extension methods defined using the _Scala 2 way_.

exercises/exercise_005_extension_methods/src/test/scala/org/lunatechlabs/dotty/sudoku/ReductionRuleSuite.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class ReductionRuleSuite extends munit.FunSuite with SudokuTestHelpers:
124124
assertEquals(applyReductionRules(input), reducedInput)
125125

126126
test(
127-
"Applying reduction rules should eliminate values in shadowed complete sets from occurrences in same cells (Second reduction rule)"):
127+
"Applying reduction rules should eliminate values in shadowed complete sets from occurrences in the same cells (Second reduction rule)"):
128128
val input = stringToReductionSet(
129129
Vector(
130130
"12 5 789", // (1,2,7,8) shadowed & complete
@@ -155,7 +155,7 @@ class ReductionRuleSuite extends munit.FunSuite with SudokuTestHelpers:
155155
assertEquals(applyReductionRules(reducedInput1), reducedInput1)
156156

157157
test(
158-
"Applying reduction rules should eliminate values in shadowed complete (6 value) sets from occurrences in same cells (Second reduction rule)"):
158+
"Applying reduction rules should eliminate values in shadowed complete (6 value) sets from occurrences in the same cells (Second reduction rule)"):
159159
val input = stringToReductionSet(
160160
Vector(
161161
"123456 89", // (1,2,3,4,5,6) shadowed & complete

exercises/exercise_005_extension_methods/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class SudokuDetailProcessorSuite extends munit.FunSuite with SudokuTestHelpers:
1111
override def afterAll(): Unit =
1212
testKit.shutdownTestKit()
1313

14-
test("Sending no updates to a sudoku detail processor should result in sending a SudokuDetailUnchanged messsage"):
14+
test("Sending no updates to a sudoku detail processor should result in sending a SudokuDetailUnchanged message"):
1515

1616
val probe = testKit.createTestProbe[SudokuDetailProcessor.Response]()
1717
val detailProcessor = testKit.spawn(SudokuDetailProcessor[Row](id = 0))

exercises/exercise_006_using_and_summon/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use of _scala 2_'s `implicit`s and `implicitly`.
1919
> `Tip`: When a context parameter is passed explicitly it must be preceded by
2020
> the `using` keyword
2121
22-
- Keep the `implicit`s at definition side for now, we can change them in the
22+
- Keep the `implicit`s at definition side for now, we can change them in the
2323
next exercise
2424

2525
- Replace all occurrences of `implicitly` with `summon`

exercises/exercise_006_using_and_summon/src/test/scala/org/lunatechlabs/dotty/sudoku/ReductionRuleSuite.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class ReductionRuleSuite extends munit.FunSuite with SudokuTestHelpers:
124124
assertEquals(applyReductionRules(input), reducedInput)
125125

126126
test(
127-
"Applying reduction rules should eliminate values in shadowed complete sets from occurrences in same cells (Second reduction rule)"):
127+
"Applying reduction rules should eliminate values in shadowed complete sets from occurrences in the same cells (Second reduction rule)"):
128128
val input = stringToReductionSet(
129129
Vector(
130130
"12 5 789", // (1,2,7,8) shadowed & complete
@@ -155,7 +155,7 @@ class ReductionRuleSuite extends munit.FunSuite with SudokuTestHelpers:
155155
assertEquals(applyReductionRules(reducedInput1), reducedInput1)
156156

157157
test(
158-
"Applying reduction rules should eliminate values in shadowed complete (6 value) sets from occurrences in same cells (Second reduction rule)"):
158+
"Applying reduction rules should eliminate values in shadowed complete (6 value) sets from occurrences in the same cells (Second reduction rule)"):
159159
val input = stringToReductionSet(
160160
Vector(
161161
"123456 89", // (1,2,3,4,5,6) shadowed & complete

exercises/exercise_006_using_and_summon/src/test/scala/org/lunatechlabs/dotty/sudoku/SudokuDetailProcessorSuite.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class SudokuDetailProcessorSuite extends munit.FunSuite with SudokuTestHelpers:
1111
override def afterAll(): Unit =
1212
testKit.shutdownTestKit()
1313

14-
test("Sending no updates to a sudoku detail processor should result in sending a SudokuDetailUnchanged messsage"):
14+
test("Sending no updates to a sudoku detail processor should result in sending a SudokuDetailUnchanged message"):
1515

1616
val probe = testKit.createTestProbe[SudokuDetailProcessor.Response]()
1717
val detailProcessor = testKit.spawn(SudokuDetailProcessor[Row](id = 0))

0 commit comments

Comments
 (0)