Merge branch 'scala:main' into patch-4

robstoll · web-flow · commit c4c7c61790e4 · 2021-12-17T17:24:39.000+01:00
diff --git a/_includes/masthead-community.html b/_includes/masthead-community.html
@@ -17,15 +17,15 @@ <h4><a href="{{forum.url}}">{{forum.title}}</a></h4>
 						{% endfor %}
 					</ul>
 				</div>
-				<div class="gitter">
-					<h3>Gitter</h3>
-					<span>Real-time (topic-specialized) chat</span>
+				<div class="discord">
+					<h3>Chat</h3>
+					<span>Real-time chat on Discord</span>
 					<ul>
-						{% for channel in site.data.chats-forums.gitterChannels %}
+						{% for server in site.data.chats-forums.discordServers %}
 							<li>
-								<a href="{{channel.url}}">
-									<img src="{{ site.baseurl }}/resources/img/frontpage/gitter-logo.png" alt="{{channel.name}}">
-									<h4>{{channel.name}}</h4>
+								<a href="{{server.url}}">
+									<img src="{{ site.baseurl }}/resources/img/frontpage/discord-logo.png" alt="{{server.name}}">
+									<h4>{{server.name}}</h4>
 								</a>
 							</li>
 						{% endfor %}
@@ -34,4 +34,4 @@ <h4>{{channel.name}}</h4>
 			</div>
 		</div>
 	</div>
-</section>
+</section>
diff --git a/_layouts/frontpage.html b/_layouts/frontpage.html
@@ -299,24 +299,24 @@ <h4>{{forum.title}}</h4>
         </a>
       {% endfor %}
     </div>
-    <div class="gitter">
-      <h3>Real-time (topic-specialized) chat</h3>
-      {% assign modLimit = site.data.chats-forums.gitterChannels.size | modulo: 2 %}
+    <div class="discord">
+      <h3>Real-time chat</h3>
+      {% assign modLimit = site.data.chats-forums.discordServers.size | modulo: 2 %}
       {% capture channelLimit %}
         {% if modLimit != 0 %}
-          {{site.data.chats-forums.gitterChannels.size | minus: 1}}
+          {{site.data.chats-forums.discordServers.size | minus: 1}}
         {% else %}
-          {{site.data.chats-forums.gitterChannels.size}}
+          {{site.data.chats-forums.discordServers.size}}
         {% endif %}
       {% endcapture %}
-      {% for channel in site.data.chats-forums.gitterChannels limit: channelLimit %}
+      {% for server in site.data.chats-forums.discordServers limit: channelLimit %}
         {% if forloop.first %}
           <ul class="first">
         {% endif %}
         <li>
-          <a href="{{channel.url}}">
-            <img src="{{ site.baseurl }}/resources/img/frontpage/gitter-logo.png" alt="">
-            <span>{{channel.name}}</span>
+          <a href="{{server.url}}">
+            <img src="{{ site.baseurl }}/resources/img/frontpage/discord-logo.png" alt="">
+            <span>{{server.name}}</span>
           </a>
         </li>
 
diff --git a/_overviews/FAQ/index.md b/_overviews/FAQ/index.md
@@ -33,8 +33,8 @@ especially popular, well-known books.
 We don't have a list of all the Scala books that
 are out there; there are many.
 
-You can go on the [Scala room on
-Gitter](https://gitter.im/scala/scala) or another community forum and
+You can go on the \#scala-users room [on
+Discord](https://discord.com/invite/scala) or another community forum and
 ask for book recommendations. You'll get more helpful
 answers if you provide some information about your background and your
 reasons for wanting to learn Scala.
@@ -55,8 +55,8 @@ way.  In time, there will be more and more Scala 3 jobs as well.
 
 This is addressed on our [Community page](https://scala-lang.org/community/#scala-jobs).
 
-In short, the only officially sanctioned place is the [scala/job-board
-room on Gitter](https://gitter.im/scala/job-board).
+In short, the only officially sanctioned place is the \#jobs channel
+[on Discord](https://discord.com/invite/scala).
 
 ### Who's behind Scala?
 
diff --git a/_overviews/scala3-book/domain-modeling-oop.md b/_overviews/scala3-book/domain-modeling-oop.md
@@ -197,7 +197,7 @@ There are a few things that need explanation.
 #### Abstract Type Members
 The declaration `type S <: Subject` says that within the trait `SubjectObserver` we can refer to some _unknown_ (that is, abstract) type that we call `S`.
 However, the type is not completely unknown: we know at least that it is _some subtype_ of the trait `Subject`.
-All traits and classes extending `SubjectObserer` are free to choose any type for `S` as long as the chosen type is a subtype of `Subject`.
+All traits and classes extending `SubjectObserver` are free to choose any type for `S` as long as the chosen type is a subtype of `Subject`.
 The `<: Subject` part of the declaration is also referred to as an _upper bound on `S`_.
 
 #### Nested Traits
diff --git a/_overviews/scala3-book/types-adts-gadts.md b/_overviews/scala3-book/types-adts-gadts.md
@@ -168,7 +168,7 @@ It is only safe to return an `Int` in the first case, since we know from pattern
 
 
 ## Desugaring Enumerations
-_Conceptually_, enums can be thought of as defining a sealed class together with an companion object.
+_Conceptually_, enums can be thought of as defining a sealed class together with its companion object.
 Let’s look at the desugaring of our `Color` enum above:
 ```scala
 sealed abstract class Color(val rgb: Int) extends scala.reflect.Enum
diff --git a/_overviews/scala3-macros/tutorial/quotes.md b/_overviews/scala3-macros/tutorial/quotes.md
@@ -502,5 +502,38 @@ def setOfCode[T: Type](using Quotes): Expr[Set[T]] =
 The difference is that, in the second scenario, we expand the macro before the implicit search is performed. We can therefore write arbitrary code to handle the case when an `Ordering[T]` is not found.
 Here, we used `HashSet` instead of `TreeSet` because the former does not need an `Ordering`.
 
+## Quoted Type Classes
+
+In the previous example we showed how to use the `Expr[Ordering[T]]` type class explicitly by leveraging the `using` argument clause. This is perfectly fine, but it is not very convenient if we need to use the type class multiple times. To show this we will
+use a `powerCode` function that can be used on any numeric type.
+
+First, it can be useful to make `Expr` type class can make it a given parameter. To do this we do need to explicitly in `power` to `powerCode` because we have a given `Numeric[Num]` but require an `Expr[Numeric[Num]]`. But then we can ignore it in `powerMacro` and any other place that only passes it around.
+
+```scala
+inline def power[Num](x: Num, inline n: Int)(using num: Numeric[Num]) =
+  ${ powerMacro('x, 'n)(using 'num) }
+
+def powerMacro[Num: Type](x: Expr[Num], n: Expr[Int])(using Expr[Numeric[Num]])(using Quotes): Expr[Num] =
+  powerCode(x, n.valueOrAbort)
+```
+
+To use a this type class we need a given `Numeric[Num]` but we have a `Expr[Numeric[Num]]` and therefore we need to splice this expression in the generated code. To make it available we can just splice it in a given definition.
+
+```scala
+def powerCode[Num: Type](x: Expr[Num], n: Int)(using num: Expr[Numeric[Num]])(using Quotes): Expr[Num] =
+  if (n == 0) '{ $num.one }
+  else if (n % 2 == 0) '{
+    given Numeric[Num] = $num
+    val y = $x * $x
+    ${ powerCode('y, n / 2) }
+  }
+  else '{
+    given Numeric[Num] = $num
+    $x * ${ powerCode(x, n - 1) }
+  }
+```
+
+
+
 [macros]: {% link _overviews/scala3-macros/tutorial/macros.md %}
 [quotes]: {% link _overviews/scala3-macros/tutorial/quotes.md %}
diff --git a/_overviews/scala3-scaladoc/settings.md b/_overviews/scala3-scaladoc/settings.md
@@ -87,7 +87,7 @@ A mapping is of the form '\<regex>::\[scaladoc3|scaladoc|javadoc]::\<path>'. You
 
 Links to social sites. For example:
 
-`-social-links:github::https://github.com/lampepfl/dotty,gitter::https://gitter.im/scala/scala,twitter::https://twitter.com/scala_lang`
+`-social-links:github::https://github.com/lampepfl/dotty,discord::https://discord.com/invite/scala,twitter::https://twitter.com/scala_lang`
 
 Valid values are of the form: '\[github|twitter|gitter|discord]::link'. Scaladoc also supports 'custom::link::white_icon_name::black_icon_name'. In this case icons must be present in 'images/' directory.
 
diff --git a/_sass/layout/table-of-content.scss b/_sass/layout/table-of-content.scss
@@ -109,7 +109,7 @@
     @include clearfix;
     padding-bottom: $padding-small;
     .discourse,
-    .gitter {
+    .discord {
         h3 {
             margin-top: 0;
         }
@@ -168,7 +168,7 @@
         }
     }
 
-    .gitter {
+    .discord {
       ul {
         li {
           @include span-columns(3 of 6);
diff --git a/_sass/layout/talk-to-us.scss b/_sass/layout/talk-to-us.scss
@@ -25,7 +25,7 @@
     }
 
     .discourse,
-    .gitter {
+    .discord {
         margin-bottom: 50px;
         @include clearfix;
     }
@@ -76,7 +76,7 @@
         }
     }
 
-    .gitter {
+    .discord {
         ul.first {
             @include shift(2);
 
diff --git a/_sips/sip-template.md b/_sips/sip-template.md
@@ -110,10 +110,8 @@ process anyway so it's better to get them out up front.
 2. [API Documentation][2]
 3. [Academic/Research papers/supporting material][3]
 4. [Alternative Libraries/Implementations][4]
-5. [Discussion forum/post/gitter/IRC][5]
 
 [1]: https://github.com "GitHub"
 [2]: https://www.scala-lang.org/api/ "Scaladoc"
 [3]: https://en.wikipedia.org/wiki/Academic_publishing "Academic/Research"
 [4]: https://github.com/dogescript/dogescript "Alternatives"
-[5]: https://gitter.im "Gitter"
diff --git a/contribute.md b/contribute.md
@@ -69,7 +69,7 @@ The goal of this documentation repository is to be tighter and more organized th
 - **be polished** it must be thorough, complete, correct, organized, and "article-like" (personal programming notes don't quite fit.)
 - **be maintained** if the document might require revisions from time to time, it should come with an owner
 
-If you have something you're thinking about contributing, or that you're thinking about writing in order to contribute-- we'd love to consider it! Please don't hesitate to use GitHub issues and pull requests and the [scala/contributors room](https://gitter.im/scala/contributors) on Gitter for any questions, concerns, clarifications, etc.
+If you have something you're thinking about contributing, or that you're thinking about writing in order to contribute-- we'd love to consider it! Please don't hesitate to use GitHub issues and pull requests and the \#scala-contributors room [on Discord](https://discord.com/invite/scala) for any questions, concerns, clarifications, etc.
 
 ## Document Templates
 
diff --git a/resources/img/frontpage/discord-logo.png b/resources/img/frontpage/discord-logo.png
diff --git a/resources/img/frontpage/gitter-logo.png b/resources/img/frontpage/gitter-logo.png
diff --git a/scala3/scaladoc.md b/scala3/scaladoc.md
@@ -35,7 +35,7 @@ Blog posts are a specific type of static sites. In the Scaladoc manual you can f
 
 ### Social links
 
-Furthermore, Scaladoc provides an easy way to configure your [social media links][social-links] e.g. Twitter or Gitter.
+Furthermore, Scaladoc provides an easy way to configure your [social media links][social-links] e.g. Twitter or Discord.
 
 ![](../resources/images/scala3/scaladoc/social-links.png){: style="width: 180px"}
 

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@`
`109`	`109`	`@include clearfix;`
`110`	`110`	`padding-bottom: $padding-small;`
`111`	`111`	`.discourse,`
`112`		`- .gitter {`
	`112`	`+ .discord {`
`113`	`113`	`h3 {`
`114`	`114`	`margin-top: 0;`
`115`	`115`	`}`
`@@ -168,7 +168,7 @@`
`168`	`168`	`}`
`169`	`169`	`}`
`170`	`170`
`171`		`- .gitter {`
	`171`	`+ .discord {`
`172`	`172`	`ul {`
`173`	`173`	`li {`
`174`	`174`	`@include span-columns(3 of 6);`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`.discourse,`
`28`		`- .gitter {`
	`28`	`+ .discord {`
`29`	`29`	`margin-bottom: 50px;`
`30`	`30`	`@include clearfix;`
`31`	`31`	`}`
`@@ -76,7 +76,7 @@`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`
`79`		`- .gitter {`
	`79`	`+ .discord {`
`80`	`80`	`ul.first {`
`81`	`81`	`@include shift(2);`
`82`	`82`