Skip to content

Commit 8e9ac75

Browse files
authored
Merge pull request #10144 from dotty-staging/fix-whitespace-scala3doc
fix #10138: trim trailing whitespace
2 parents 0946121 + 0dbb16e commit 8e9ac75

Some content is hidden

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

52 files changed

+358
-358
lines changed

scala3doc/dotty-docs/docs/_layouts/base.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@
2828
window.scrollTo(0, $(window.location.hash).offset().top - 90);
2929
}
3030
})
31-
</script>
31+
</script>

scala3doc/dotty-docs/docs/blog/_posts/2019-01-21-12th-dotty-milestone-release.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,4 +221,4 @@ to make sure that our regression suite includes your library.
221221
[@Blaisorblade]: https://github.com/Blaisorblade
222222
[@Duhemm]: https://github.com/Duhemm
223223
[@AleksanderBG]: https://github.com/AleksanderBG
224-
[@milessabin]: https://github.com/milessabin
224+
[@milessabin]: https://github.com/milessabin

scala3doc/dotty-docs/docs/docs/contributing/contribute-knowledge.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ If you know anything useful at all about Dotty, feel free to log this knowledge:
99
- [📜Log the Knowledge](https://github.com/lampepfl/dotty-knowledge/issues/new)
1010
- [🎓More about Logging the Knowledge](https://github.com/lampepfl/dotty-knowledge/blob/master/README.md)
1111

12-
In short, no need to make it pretty, particularly human-readable or give it a particular structure. Just dump the knowledge you have and we'll take it from there.
12+
In short, no need to make it pretty, particularly human-readable or give it a particular structure. Just dump the knowledge you have and we'll take it from there.

scala3doc/dotty-docs/docs/docs/contributing/procedures/release.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,4 +152,4 @@ git checkout master
152152

153153
git commit -am 'Set baseVersion to 0.16.0'
154154
git push origin master
155-
```
155+
```

scala3doc/dotty-docs/docs/docs/contributing/testing.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ Running all tests in Dotty is as simple as:
99
$ sbt test
1010
```
1111

12-
Specifically, `sbt test` runs all tests that do _not_ require a bootstrapped
13-
compiler. In practice, this means that it runs all compilation tests meeting
14-
this criterion, as well as all non-compiler tests.
12+
Specifically, `sbt test` runs all tests that do _not_ require a bootstrapped
13+
compiler. In practice, this means that it runs all compilation tests meeting
14+
this criterion, as well as all non-compiler tests.
1515

1616
The entire suite of tests can be run using the bootstrapped compiler as follows:
1717

scala3doc/dotty-docs/docs/docs/reference/changed-features/pattern-matching.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,4 +240,4 @@ def foo(f: Foo) = f match {
240240
```
241241

242242
There are plans for further simplification, in particular to factor out *product
243-
match* and *name-based match* into a single type of extractor.
243+
match* and *name-based match* into a single type of extractor.

scala3doc/dotty-docs/docs/docs/reference/contextual/extension-methods.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ def extension_position(s: String)(ch: Char, n: Int): Int =
259259
extension (x: Double) def ** (exponent: Int): Double =
260260
require(exponent >= 0)
261261
if exponent == 0 then 1 else x * (x ** (exponent - 1))
262-
262+
263263
import DoubleOps.{**, extension_**}
264264
assert(2.0 ** 3 == extension_**(2.0)(3))
265265
```

scala3doc/dotty-docs/docs/docs/reference/dropped-features/macros.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ layout: doc-page
33
title: Dropped: Scala 2 Macros
44
---
55

6-
The previous, experimental macro system has been dropped. Instead, there is a cleaner, more restricted system based on two complementary concepts: `inline` and `'{ ... }`/`${ ... }` code generation.
6+
The previous, experimental macro system has been dropped. Instead, there is a cleaner, more restricted system based on two complementary concepts: `inline` and `'{ ... }`/`${ ... }` code generation.
77
`'{ ... }` delays the compilation of the code and produces an object containing the code, dually `${ ... }` evaluates an expression which produces code and inserts it in the surrounding `${ ... }`.
88
In this setting, a definition marked as inlined containing a `${ ... }` is a macro, the code inside the `${ ... }` is executed at compile-time and produces code in the form of `'{ ... }`.
99
Additionally, the contents of code can be inspected and created with a more complex reflection API (TASTy Reflect) as an extension of `'{ ... }`/`${ ... }` framework.

scala3doc/dotty-docs/docs/docs/reference/features-classification.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,4 +199,4 @@ Some existing programs will break and, given the complex nature of type inferenc
199199

200200
In our experience, macros and changes in type and implicit argument inference together cause the large majority of problems encountered when porting existing code to Scala 3. The latter source of problems could be addressed systematically by a tool that added all inferred types and implicit arguments to a Scala 2 source code file. Most likely such a tool would be implemented as a Scala 2 compiler plugin. The resulting code would have a greatly increased likelihood to compile under Scala 3, but would often be bulky to the point of being unreadable. A second part of the rewriting tool should then selectively and iteratively remove type and implicit annotations that were synthesized by the first part as long as they compile under Scala 3. This second part could be implemented as a program that invokes the Scala 3 compiler `dotc` programmatically.
201201

202-
Several people have proposed such a tool for some time now. I believe it is time we find the will and the resources to actually implement it.
202+
Several people have proposed such a tool for some time now. I believe it is time we find the will and the resources to actually implement it.

scala3doc/dotty-docs/docs/docs/reference/metaprogramming/inline.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -268,10 +268,10 @@ val obj2 = choose(false) // static type is B
268268
// obj1.m() // compile-time error: `m` is not defined on `A`
269269
obj2.m() // OK
270270
```
271-
Here, the inline method `choose` returns an instance of either of the two types `A` or `B`.
271+
Here, the inline method `choose` returns an instance of either of the two types `A` or `B`.
272272
If `choose` had not been declared to be `transparent`, the result
273-
of its expansion would always be of type `A`, even though the computed value might be of the subtype `B`.
274-
The inline method is a "blackbox" in the sense that details of its implementation do not leak out.
273+
of its expansion would always be of type `A`, even though the computed value might be of the subtype `B`.
274+
The inline method is a "blackbox" in the sense that details of its implementation do not leak out.
275275
But if a `transparent` modifier is given, the expansion is the type of the expanded body. If the argument `b`
276276
is `true`, that type is `A`, otherwise it is `B`. Consequently, calling `m` on `obj2`
277277
type-checks since `obj2` has the same type as the expansion of `choose(false)`, which is `B`.

0 commit comments

Comments
 (0)