Skip to content
This repository was archived by the owner on Sep 30, 2020. It is now read-only.

Commit ae80c2d

Browse files
34428535613442853561
authored
Merge pull request #1 from rust-lang/master
17.2.3.0.57
2 parents 63dc185 + c5c0754 commit ae80c2d

34 files changed

+343
-147
lines changed

‎_data/users.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,11 @@
282282
url: http://www.trafficland.com/
283283
logo: trafficland.svg
284284
how: "Video transcoding, manipulation, and analysis."
285+
-
286+
name: Wire
287+
url: https://wire.com
288+
logo: Wire.png
289+
how: "Wire's Axolotl protocol implementation and other cryptographic and utility libraries are developed in Rust, then cross-compiled for iOS and Android."
285290
-
286291
name: Xero
287292
url: https://www.xero.com

‎_includes/friends.js

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
function swapDiv(e1, e2){
2+
var e1p = e1.parentNode;
3+
var e2p = e2.parentNode;
4+
var e2s = e2.nextSibling;
5+
6+
e1p.replaceChild(e2, e1);
7+
if (e2s) {
8+
e2p.insertBefore(e1, e2s);
9+
} else {
10+
e2p.appendChild(e1);
11+
}
12+
}
13+
14+
function shuffle() {
15+
var friends = document.querySelectorAll(".friend");
16+
for (var i = 0; i < friends.length; i++) {
17+
var r1 = Math.floor(Math.random() * friends.length);
18+
var r2 = Math.floor(Math.random() * friends.length);
19+
swapDiv(friends[r1], friends[r2]);
20+
}
21+
}
22+
23+
shuffle();

‎_includes/rustup.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ function detect_platform() {
3333
if (os == "unknown") {
3434
if (navigator.appVersion.indexOf("Win")!=-1) {os = "win";}
3535
if (navigator.appVersion.indexOf("Mac")!=-1) {os = "unix";}
36+
// rust-www/#692 - FreeBSD epiphany!
37+
if (navigator.appVersion.indexOf("FreeBSD")!=-1) {os = "unix";}
3638
}
3739

3840
return os;

‎_includes/set_platform.js

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎_layouts/basic.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ <h2><a href="/en-US/contribute.html">Contribute</a></h2>
4747
<a href="/zh-CN/">简体中文</a>,
4848
<a href="/it-IT/">Italiano</a>
4949
<a href="/vi-VN/">Tiếng việt</a>,
50-
<a href="/zh-CN/">简体中文</a>
5150
</p>
5251
</footer>
5352

‎_layouts/fr-FR/basic.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,8 @@ <h2><a href="/fr-FR/contribute.html">Contribuer</a></h2>
4343
<a href="/ko-KR/">한국어</a>,
4444
<a href="/pt-BR/">Português</a>,
4545
<a href="/ru-RU/">Русский</a>,
46-
<a href="/zh-CN/">简体中文</a>,
4746
<a href="/it-IT/">Italiano</a>
48-
<a href="/vi-VN/">Tiếng việt</a>,
47+
<a href="/vi-VN/">Tiếng việt</a>,
4948
<a href="/zh-CN/">简体中文</a>
5049
</p>
5150
</footer>

‎_layouts/ko-KR/basic.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ <h2><a href="/ko-KR/contribute.html">기여하기</a></h2>
4343
<a href="/ja-JP/">日本語</a>,
4444
<a href="/pt-BR/">Português</a>,
4545
<a href="/ru-RU/">Русский</a>,
46-
<a href="/zh-CN/">简体中文</a>,
4746
<a href="/it-IT/">Italiano</a>
4847
<a href="/vi-VN/">Tiếng việt</a>,
4948
<a href="/zh-CN/">简体中文</a>

‎_layouts/pt-BR/basic.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ <h2><a href="/pt-BR/contribute.html">Contribua</a></h2>
4343
<a href="/ja-JP/">日本語</a>,
4444
<a href="/ko-KR/">한국어</a>,
4545
<a href="/ru-RU/">Русский</a>,
46-
<a href="/zh-CN/">简体中文</a>,
4746
<a href="/it-IT/">Italiano</a>
4847
<a href="/vi-VN/">Tiếng việt</a>,
4948
<a href="/zh-CN/">简体中文</a>

‎_layouts/ru-RU/basic.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ <h2><a href="/ru-RU/contribute.html">Участие</a></h2>
4343
<a href="/ja-JP/">日本語</a>,
4444
<a href="/ko-KR/">한국어</a>,
4545
<a href="/pt-BR/">Português</a>,
46-
<a href="/zh-CN/">简体中文</a>,
4746
<a href="/it-IT/">Italiano</a>
4847
<a href="/vi-VN/">Tiếng việt</a>,
4948
<a href="/zh-CN/">简体中文</a>

‎_layouts/zh-CN/basic.html

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,12 @@ <h2><a href="/zh-CN/contribute.html">贡献</a></h2>
4040
<p>本土化页面：
4141
<a href="/en-US/">English</a>,
4242
<a href="/fr-FR/">Français</a>,
43-
<a href="/ja-JP/">日本語</a>,
43+
<a href="/ja-JP/">日本語</a>,
4444
<a href="/ko-KR/">한국어</a>,
4545
<a href="/pt-BR/">Português</a>,
4646
<a href="/ru-RU/">Русский</a>,
47-
<<<<<<< HEAD
48-
<a href="/it-IT/">Italiano</a>
49-
=======
47+
<a href="/it-IT/">Italiano</a>,
5048
<a href="/vi-VN/">Tiếng việt</a>
51-
>>>>>>> upstream/master
5249
</p>
5350
</footer>
5451

‎css/style.css

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -667,7 +667,9 @@ footer a {
667667
letter-spacing: 0.1rem;
668668
}
669669

670-
#platform-instructions-unknown div {
670+
/* This is the box that prints navigator.platform, navigator.appVersion values */
671+
#platform-instructions-unknown > div:first-of-type {
672+
font-size: 1rem;
671673
line-height: 2rem;
672674
}
673675

‎en-US/faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1520,7 +1520,7 @@ impl Foo {
15201520
Does Rust have copy constructors?
15211521
</a></h3>
15221522

1523-
Not exactly. Types which implement `Copy` will do a standard C-like "shallow copy" with no extra work (similar to "plain old data" in C++). It is impossible to implement `Copy` types that require custom copy behavior. Instead, in Rust "copy constructors" are created by implementing the `Clone` trait, and explicitly calling the `clone` method. Making user-defined copy operators explicit surfaces the underlying complexity, making it easier for the developer to identify potentially expensive operations.
1523+
Not exactly. Types which implement `Copy` will do a standard C-like "shallow copy" with no extra work (similar to trivially copyable types in C++). It is impossible to implement `Copy` types that require custom copy behavior. Instead, in Rust "copy constructors" are created by implementing the `Clone` trait, and explicitly calling the `clone` method. Making user-defined copy operators explicit surfaces the underlying complexity, making it easier for the developer to identify potentially expensive operations.
15241524

15251525
<h3><a href="#does-rust-have-move-constructors" name="does-rust-have-move-constructors">
15261526
Does Rust have move constructors?

‎en-US/friends.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ <h2>(Organizations running Rust in production)</h2>
1818

1919
<div class="row">
2020
{% for user in site.data.users limit:3 offset:offset %}
21-
<div class="col-md-4"
21+
<div class="col-md-4 friend"
2222
id="user-logo-{{offset}}-{{forloop.index}}">
2323
<div class="user-container">
2424
<a href="{{user.url}}" rel="nofollow" alt="{{user.name}}">
@@ -69,3 +69,7 @@ <h2>(Organizations running Rust in production)</h2>
6969
</p>
7070

7171
</div>
72+
73+
<script type="text/javascript">
74+
{% include friends.js %}
75+
</script>

‎en-US/install.html

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,38 @@ <h1 class="rustup">Install Rust</h1>
3333
</div>
3434

3535
<div id="platform-instructions-unknown" class="instructions" style="display: none;">
36+
<!-- unrecognized platform: ask for help -->
3637
<p>I don't recognize your platform.</p>
3738
<p>
3839
Rust runs on Windows, Linux, Mac OS X, FreeBSD and NetBSD. If
3940
you are on one of these platforms and are seeing this then please
4041
<a href="https://github.com/rust-lang/rust-www/issues/new">report an issue</a>,
4142
along with the following values:
42-
<div>
43-
<div>navigator.platform:</div>
44-
<div id="nav-plat"></div>
45-
<div>navigator.appVersion:</div>
46-
<div id="nav-app"></div>
47-
</div>
4843
</p>
44+
45+
<div>
46+
<div>navigator.platform:</div>
47+
<div id="nav-plat"></div>
48+
<div>navigator.appVersion:</div>
49+
<div id="nav-app"></div>
50+
</div>
51+
52+
<!-- duplicate the default cross-platform instructions -->
53+
<div>
54+
<p>To install Rust, if you are running Unix,<br/>run the following
55+
in your terminal, then follow the onscreen instructions.</p>
56+
<pre>curl https://sh.rustup.rs -sSf | sh</pre>
57+
</div>
58+
59+
<hr/>
60+
61+
<div>
62+
<p>
63+
If you are running Windows,<br/>download and run
64+
<a href="https://win.rustup.rs">rustup&#x2011;init.exe</a>
65+
then follow the onscreen instructions.
66+
</p>
67+
</div>
4968
</div>
5069

5170
<div id="platform-instructions-default" class="instructions">
@@ -175,7 +194,7 @@ <h3>Windows considerations</h3>
175194
</div>
176195
</div>
177196

178-
<h2>Other installation methods</h3>
197+
<h2>Other installation methods</h2>
179198

180199
<div class="row">
181200
<div class="col-md-12">

‎en-US/user-groups.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ even better, open a pull request against
7878

7979
[Rust lang Milano](https://www.meetup.com/Rust-lang-Milano/), Milano.
8080

81+
[Rust Rome](https://www.meetup.com/it-IT/Rust-Roma/), Rome.
82+
8183
## Japan
8284

8385
[Tokyo Rust](https://www.meetup.com/Tokyo-Rust-Meetup/), Tokyo.

‎es-ES/friends.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ <h2>(Organizaciones que ejecutan Rust en producción)</h2>
1818

1919
<div class="row">
2020
{% for user in site.data.users limit:3 offset:offset %}
21-
<div class="col-md-4"
21+
<div class="col-md-4 friend"
2222
id="user-logo-{{offset}}-{{forloop.index}}">
2323
<div class="user-container">
2424
<a href="{{user.url}}" rel="nofollow" alt="{{user.name}}">
@@ -69,3 +69,7 @@ <h2>(Organizaciones que ejecutan Rust en producción)</h2>
6969
</p>
7070

7171
</div>
72+
73+
<script type="text/javascript">
74+
{% include friends.js %}
75+
</script>

‎es-ES/index.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ <h2>Funcionalidades</h2>
3434
<li>inferencia de tipos</li>
3535
<li><i>runtime</i> mínimo</li>
3636
<li><i>bindings</i> eficientes con C</li>
37-
<li></li>
3837
</ul>
3938
</div>
4039
<div class="col-md-8">

‎es-ES/install.html

Lines changed: 31 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -42,32 +42,45 @@ <h1 class="rustup">Instalar Rust</h1>
4242
</div>
4343

4444
<div id="platform-instructions-unknown" class="instructions" style="display: none;">
45+
<!-- unrecognized platform: ask for help -->
4546
<p>No reconozco tu plataforma.</p>
46-
<p>
47-
Rust runs on Windows, Linux, Mac OS X, FreeBSD and NetBSD. If
48-
you are on one of these platforms and are seeing this then please
49-
<a href="https://github.com/rust-lang/rust-www/issues/new">report an issue</a>,
50-
along with the following values:
51-
<div>
52-
<div>navigator.platform:</div>
53-
<div id="nav-plat"></div>
54-
<div>navigator.appVersion:</div>
55-
<div id="nav-app"></div>
56-
</div>
57-
</p>
5847
<p>
5948
Rust se puede ejecutar en Windows, Linux, Max OS X, FreeBSD y
6049
NetBSD. Si estas en una de estas plataformas y estás viendo esto,
6150
por favor
6251
<a href="https://github.com/rust-lang/rust-www/issues/new">reporta un error</a>,
6352
con la siguientes información:
64-
<div>
65-
<div>navigator.platform:</div>
66-
<div id="nav-plat"></div>
67-
<div>navigator.appVersion:</div>
68-
<div id="nav-app"></div>
69-
</div>
7053
</p>
54+
55+
<div>
56+
<div>navigator.platform:</div>
57+
<div id="nav-plat"></div>
58+
<div>navigator.appVersion:</div>
59+
<div id="nav-app"></div>
60+
</div>
61+
62+
<!-- duplicate the default cross-platform instructions -->
63+
<div>
64+
<p>Para instalar Rust en Unix,<br/>ejecuta lo siguiente en tu
65+
terminal y sigue las instrucciones en pantalla.</p>
66+
<pre>curl https://sh.rustup.rs -sSf | sh</pre>
67+
</div>
68+
69+
<hr/>
70+
71+
<div>
72+
<p>
73+
If you are running Windows,<br/>download and run
74+
<a href="https://win.rustup.rs">rustup&#x2011;init.exe</a>
75+
then follow the onscreen instructions.
76+
</p>
77+
<p>
78+
Si estas en Windows,<br/>descarga y ejecuta
79+
<a href="https://win.rustup.rs">rustup&#x2011;init.exe</a>
80+
luego sigue las instrucciones en pantalla.
81+
</p>
82+
</div>
83+
7184
</div>
7285

7386
<div id="platform-instructions-default" class="instructions">

‎fr-FR/friends.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ <h2>(Entreprises utilisant Rust en environnement de production)</h2>
1818

1919
<div class="row">
2020
{% for user in site.data.users limit:3 offset:offset %}
21-
<div class="col-md-4"
21+
<div class="col-md-4 friend"
2222
id="user-logo-{{offset}}-{{forloop.index}}">
2323
<div class="user-container">
2424
<a href="{{user.url}}" rel="nofollow" alt="{{user.name}}">
@@ -68,3 +68,7 @@ <h2>(Entreprises utilisant Rust en environnement de production)</h2>
6868
</p>
6969

7070
</div>
71+
72+
<script type="text/javascript">
73+
{% include friends.js %}
74+
</script>

0 commit comments

Comments
 (0)