Skip to content

Commit 60e8684

Browse files
authored
Merge branch 'scala:main' into main
2 parents 4e32489 + d4bede1 commit 60e8684

File tree

6 files changed

+87
-21
lines changed

6 files changed

+87
-21
lines changed

_layouts/sip-meeting-results.html

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
---
2+
layout: sips
3+
---
4+
5+
<p>The Committee discussed and voted on the proposals listed below.</p>
6+
7+
<table>
8+
<thead>
9+
<tr><th>Proposal</th><th>Result</th></tr>
10+
</thead>
11+
<tbody>
12+
{% for proposal in page.proposals %}
13+
<tr>
14+
<td><a href="{{ proposal.url }}">{{proposal.name}}</a></td>
15+
<td>
16+
{% if proposal.result == 'rejected' %}
17+
Rejected <span class="fa fa-xmark"></span>
18+
{% elsif proposal.result == 'accepted' %}
19+
Accepted <span class="fa fa-check"></span>
20+
{% else %}
21+
Under Review <span class="fa fa-clipboard-list"></span>
22+
{% endif %}
23+
</td>
24+
</tr>
25+
{% endfor %}
26+
</tbody>
27+
</table>

_layouts/sips.html

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ <h5 class="contents" style="margin-bottom: 0;">SIP Meetings</h5>
2121
<div id="sip-meetings">
2222
<div id="meeting-minutes">
2323
<ul>
24-
<li><a href="{{ site.baseurl }}/sips/minutes-list.html">Meeting Minutes</a></li>
25-
<li><a href="https://www.youtube.com/channel/UCn_8OeZlf5S6sqCqntAvaIw/videos?view=2&sort=dd&shelf_id=1&live_view=502">Meeting Video Registrations (YouTube)</a></li>
24+
<li><a href="{{ site.baseurl }}{% link _sips/meeting-results.md %}">Meeting Results</a></li>
2625
</ul>
2726
</div>
2827
</div>

_sips/meeting-results.md

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
---
2+
layout: sips
3+
title: SIP Meeting Results
4+
redirect_from: /sips/minutes-list.html
5+
---
6+
7+
This page lists the results of every SIP meeting, starting from July 2016.
8+
9+
### Meetings ###
10+
11+
<ul class="minute-list">
12+
{% assign sips = site.sips | sort: 'date' | reverse %}
13+
{% for page in sips %}
14+
{% if page.partof == 'results' %}
15+
<li><a href="{{ site.baseurl }}{{ page.url }}">{{ page.date | date_to_long_string }}</a></li>
16+
{% endif %}
17+
{% endfor %}
18+
</ul>
19+
20+
### Meeting Minutes ###
21+
22+
Before 2022, we hosted the complete meeting notes (minutes). Some
23+
meetings were also [recorded on YouTube](https://www.youtube.com/channel/UCn_8OeZlf5S6sqCqntAvaIw/videos?view=2&sort=dd&shelf_id=1&live_view=502).
24+
25+
<ul class="minute-list">
26+
{% assign sips = site.sips | sort: 'date' | reverse %}
27+
{% for pg in sips %}
28+
{% if pg.partof == 'minutes' %}
29+
<li><a href="{{ site.baseurl }}{{ pg.url }}">{{ pg.title }}</a></li>
30+
{% endif %}
31+
{% endfor %}
32+
</ul>

_sips/minutes-list.md

-17
This file was deleted.

_sips/results/2022-08-26-meeting.md

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
---
2+
layout: sip-meeting-results
3+
title: SIP Meeting Results - 26th August 2022
4+
partof: results
5+
proposals:
6+
- url: https://github.com/scala/improvement-proposals/pull/29
7+
name: SIP-32 - Allow referring to other arguments in default parameters
8+
result: rejected
9+
- url: https://github.com/scala/improvement-proposals/pull/37
10+
name: SIP-39 - Uncluttering Abuse of Match
11+
result: rejected
12+
- url: https://docs.scala-lang.org/sips/binary-integer-literals.html
13+
name: SIP-42 - Binary Integer Literals
14+
result: accepted
15+
- url: https://github.com/scala/improvement-proposals/pull/42
16+
name: SIP-40 - Name Based XML Literals
17+
result: rejected
18+
- url: https://github.com/scala/improvement-proposals/pull/41
19+
name: SIP-45 - Curried varargs
20+
result: rejected
21+
- url: https://docs.scala-lang.org/sips/fewer-braces.html
22+
name: SIP-44 - Fewer braces
23+
result: accepted
24+
---
25+

index.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ sections:
9090

9191
- title: "Scala Evolution"
9292
links:
93-
- title: "SIPs"
94-
description: "The Scala Improvement Process. Language & compiler evolution."
93+
- title: "Scala Improvement Process"
94+
description: "Description of the process for evolving the language, and list of all the Scala Improvement Proposals (SIPs)."
9595
icon: "fa fa-cogs"
9696
link: /sips/index.html
9797
- title: "Become a Scala OSS Contributor"

0 commit comments

Comments
 (0)