Skip to content

Commit 87288e3

Browse files
committed
Revert some of the edits
1 parent a56ddf5 commit 87288e3

File tree

9 files changed

+9
-9
lines changed

9 files changed

+9
-9
lines changed

docs/blog/_posts/2016-02-03-essence-of-scala.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,4 +142,4 @@ project are important.
142142
This lets us put other constructs of the Scala language to the test,
143143
either to increase our confidence that they are indeed sound, or
144144
to show that they are unsound. In my next blog I will
145-
present some issues we have discovered through that exercise.
145+
present some of the issues we have discovered through that exercise.

docs/blog/_posts/2019-04-15-14th-dotty-milestone-release.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ For more information, please see the [documentation](https://dotty.epfl.ch/docs/
122122

123123
## Other changes
124124

125-
Some other changes include:
125+
Some of the other changes include:
126126

127127
- `infer` method renamed to `the`, the semantics of which is now the same as that of the `the` method of Shapeless. Namely, the implicits are resolved more precisely – see this [gist](https://gist.github.com/milessabin/8833a1dbf7e8245b30f8) for an example in Shapeless, and the Dotty [documentation](https://dotty.epfl.ch/docs/reference/contextual/given-clauses.html#querying-implied-instances) for more details.
128128
- The syntax of quoting and splicing was changed. Now the quoting is expressed via `'{ ... }` and `'[...]` and splicing – via `${...}` and `$id`. Please see the [documentation](https://dotty.epfl.ch/docs/reference/metaprogramming/macros.html) for more details on these features.

docs/blog/_posts/2019-05-23-15th-dotty-milestone-release.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ def eval[T](e: Expr[T]): T = e match {
167167
We've also plugged a few soundness problems (e.g. [#5667](https://github.com/lampepfl/dotty/issues/5667)) caused by inferring too much when matching on abstract, union and intersection types. For more information, see PR [#5736](https://github.com/lampepfl/dotty/pull/5736).
168168

169169
## Other changes
170-
Some other notable changes include the following:
170+
Some of the other notable changes include the following:
171171

172172
- Singletons are now allowed in union types. E.g. the following is allowed: `object foo; type X = Int | foo.type`.
173173
- A bunch of improvements was made for the type inference system – see, e.g., PRs [#6454](https://github.com/lampepfl/dotty/pull/6454) and [#6467](https://github.com/lampepfl/dotty/pull/6467).

docs/docs/contributing/procedures/release.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Above, `<stable_release>` is the stable version being released. For example, if
5858

5959
Copy and paste the output into the release issue.
6060

61-
The ecosystem update section for some projects also mentions a set of criteria upon which the project is to be marked in the checklist. When the Travis build status is specified next to the project's name, it is to be understood that this build must pass after all the other criteria of that project are checked. Note that due to caching, the label image next to the link may not reflect the real status of the build. Therefore, to verify the status, click on the link and make sure that your recent commit passes.
61+
The ecosystem update section for some projects also mentions a set of criteria upon which the project is to be marked in the checklist. When the Travis build status is specified next to the project's name, it is to be understood that this build must pass after all of the other criteria of that project are checked. Note that due to caching, the label image next to the link may not reflect the real status of the build. Therefore, to verify the status, click on the link and make sure that your recent commit passes.
6262

6363
When no criteria is specified, common sense is to be used.
6464

docs/docs/internals/overall-structure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ context".
8282

8383
With these two conventions in place, it has turned out that implicit contexts
8484
work amazingly well as a device for dependency injection and bulk
85-
parameterization. There is of course always the danger that an unexpected
85+
parameterization. There is of course always the danger that an unexpected
8686
implicit will be passed, but in practice this has not turned out to be much of
8787
a problem.
8888

docs/docs/internals/periods.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: "Dotc's concept of time"
44
---
55

66
Conceptually, the `dotc` compiler's job is to maintain views of various
7-
artifacts associated with source code at all points in time. But what is
7+
artifacts associated with source code at all points in time. But what is
88
*time* for `dotc`? In fact, it is a combination of compiler runs and compiler
99
phases.
1010

docs/docs/reference/contextual/motivation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ This design thus avoids feature interactions and makes the language more consist
7373

7474
Could we achieve the same goals by tweaking existing implicits? After having tried for a long time, I believe now that this is impossible.
7575

76-
- First, some problems are clearly syntactic and require different syntax to solve them.
76+
- First, some of the problems are clearly syntactic and require different syntax to solve them.
7777
- Second, there is the problem how to migrate. We cannot change the rules in mid-flight. At some stage of language evolution we need to accommodate both the new and the old rules. With a syntax change, this is easy: Introduce the new syntax with new rules, support the old syntax for a while to facilitate cross compilation, deprecate and phase out the old syntax at some later time. Keeping the same syntax does not offer this path, and in fact does not seem to offer any viable path for evolution
7878
- Third, even if we would somehow succeed with migration, we still have the problem
7979
how to teach this. We cannot make existing tutorials go away. Almost all existing tutorials start with implicit conversions, which will go away; they use normal imports, which will go away, and they explain calls to methods with implicit parameters by expanding them to plain applications, which will also go away. This means that we'd have

docs/docs/reference/contextual/relationship-implicits.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ implicit class CircleDecorator(c: Circle) extends AnyVal {
119119
def circumference: Double = c.radius * math.Pi * 2
120120
}
121121
```
122-
Abstract extension methods in traits that are implemented in given instances have no direct counterpart in Scala-2. The only way to simulate this is to make implicit classes available through imports. The Simulacrum macro library can automate this process in some cases.
122+
Abstract extension methods in traits that are implemented in given instances have no direct counterpart in Scala-2. The only way to simulate these is to make implicit classes available through imports. The Simulacrum macro library can automate this process in some cases.
123123

124124
### Typeclass Derivation
125125

docs/docs/resources/talks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ This is a recorded meeting between EPFL and Waterloo, where we introduce denotat
3838

3939
- (Typelevel Summit Oslo, May 2016) [Dotty and types: the story so far](https://www.youtube.com/watch?v=YIQjfCKDR5A) by
4040
Guillaume Martres [\[slides\]](http://guillaume.martres.me/talks/typelevel-summit-oslo/).
41-
Guillaume focused on some practical improvements to the type system that Dotty makes, like the new type parameter
41+
Guillaume focused on some of the practical improvements to the type system that Dotty makes, like the new type parameter
4242
inference algorithm that is able to reason about the type safety of more situations than scalac.
4343

4444
- (flatMap(Oslo) 2016) [AutoSpecialization in Dotty](https://vimeo.com/165928176) by [Dmitry Petrashko](http://twitter.com/darkdimius) [\[slides\]](https://d-d.me/talks/flatmap2016/#/).

0 commit comments

Comments
 (0)