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

Commit 3244aca

Browse files
34428535613442853561
authored
Merge pull request #14 from rust-lang/master
16.12.21.20.5
2 parents 9bf0c03 + cb20d49 commit 3244aca

40 files changed

+2856
-1420
lines changed

‎_config.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
11
name: The Rust Programming Language
22
stable: "1.13.0"
33
stable_date: "2016-11-10"
4-
stable_blog: "/2016/11/10/Rust-1.13.html"
4+
stable_blog: "https://blog.rust-lang.org/2016/11/10/Rust-1.13.html"
5+
stable_full_version: "rustc 1.13.0 (2c6933acc 2016-11-07)"
56
beta: "1.14"
67
beta_date: "2016-12-22"
78
nightly: "1.15"
9+
channels:
10+
- name: "stable"
11+
vers: "1.13.0"
12+
package: "1.13.0"
13+
- name: "beta"
14+
vers: "1.14"
15+
package: "beta"
16+
- name: "nightly"
17+
vers: "1.15"
18+
package: "nightly"

‎_data/platforms.yml

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
rustup:
2+
-
3+
- aarch64-unknown-linux-gnu
4+
- arm-unknown-linux-gnueabi
5+
- arm-unknown-linux-gnueabihf
6+
- i686-apple-darwin
7+
- i686-pc-windows-gnu
8+
- i686-pc-windows-msvc
9+
- i686-unknown-linux-gnu
10+
-
11+
- powerpc-unknown-linux-gnu
12+
- powerpc64-unknown-linux-gnu
13+
- powerpc64le-unknown-linux-gnu
14+
- x86_64-apple-darwin
15+
- x86_64-pc-windows-gnu
16+
- x86_64-pc-windows-msvc
17+
- x86_64-unknown-freebsd
18+
- x86_64-unknown-linux-gnu
19+
- x86_64-unknown-netbsd
20+
21+
stable:
22+
-
23+
- aarch64-unknown-linux-gnu
24+
- arm-unknown-linux-gnueabi
25+
- arm-unknown-linux-gnueabihf
26+
- i686-apple-darwin
27+
- i686-pc-windows-gnu
28+
- i686-pc-windows-msvc
29+
- i686-unknown-linux-gnu
30+
-
31+
- x86_64-apple-darwin
32+
- x86_64-pc-windows-gnu
33+
- x86_64-pc-windows-msvc
34+
- x86_64-unknown-freebsd
35+
- x86_64-unknown-linux-gnu
36+
- x86_64-unknown-netbsd
37+
38+
beta:
39+
-
40+
- aarch64-unknown-linux-gnu
41+
- arm-unknown-linux-gnueabi
42+
- arm-unknown-linux-gnueabihf
43+
- i686-apple-darwin
44+
- i686-pc-windows-gnu
45+
- i686-pc-windows-msvc
46+
- i686-unknown-linux-gnu
47+
- mips-unknown-linux-gnu
48+
- mipsel-unknown-linux-gnu
49+
- mips64-unknown-linux-gnuabi64
50+
-
51+
- powerpc-unknown-linux-gnu
52+
- powerpc64-unknown-linux-gnu
53+
- powerpc64le-unknown-linux-gnu
54+
- s390x-unknown-linux-gnu
55+
- x86_64-apple-darwin
56+
- x86_64-pc-windows-gnu
57+
- x86_64-pc-windows-msvc
58+
- x86_64-unknown-freebsd
59+
- x86_64-unknown-linux-gnu
60+
- x86_64-unknown-netbsd
61+
62+
nightly:
63+
-
64+
- aarch64-unknown-linux-gnu
65+
- arm-unknown-linux-gnueabi
66+
- arm-unknown-linux-gnueabihf
67+
- i686-apple-darwin
68+
- i686-pc-windows-gnu
69+
- i686-pc-windows-msvc
70+
- i686-unknown-linux-gnu
71+
- mips-unknown-linux-gnu
72+
- mipsel-unknown-linux-gnu
73+
- mips64-unknown-linux-gnuabi64
74+
-
75+
- powerpc-unknown-linux-gnu
76+
- powerpc64-unknown-linux-gnu
77+
- powerpc64le-unknown-linux-gnu
78+
- s390x-unknown-linux-gnu
79+
- x86_64-apple-darwin
80+
- x86_64-pc-windows-gnu
81+
- x86_64-pc-windows-msvc
82+
- x86_64-unknown-freebsd
83+
- x86_64-unknown-linux-gnu
84+
- x86_64-unknown-netbsd

‎_data/users.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,11 @@
7777
url: http://calyptech.com
7878
logo: calyptech.png
7979
how: "Used for high performance embedded system components as an alternative to C."
80+
-
81+
name: Cambridge Consultants
82+
url: http://www.cambridgeconsultants.com/
83+
logo: cambridge-consultants.png
84+
how: "<a href='http://blog.cambridgeconsultants.com/wireless-product-development/presentation-mozillas-rust-and-why-we-love-it/'>We are writing and shipping Rust code on projects to our clients</a>."
8085
-
8186
name: Canonical
8287
url: http://www.canonical.com
@@ -252,6 +257,11 @@
252257
url: http://thoughtram.io
253258
logo: thoughtram.png
254259
how: "The backend of our training platform classroom.thoughtram.io is 100 % Rust using nickel.rs"
260+
-
261+
name: ThreatX
262+
url: https://threat-x.com/
263+
logo: threatx.svg
264+
how: "Threat X Web Application Firewall (WAF) and central analysis engine are written in Rust, facilitating real time analysis of high bandwidth web applications."
255265
-
256266
name: Tilde
257267
url: http://www.tilde.io

‎_includes/rustup.js

Lines changed: 150 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,150 @@
1+
var platform_override = null;
2+
3+
function detect_platform() {
4+
"use strict";
5+
6+
if (platform_override) {
7+
return platform_override;
8+
}
9+
10+
var os = "unknown";
11+
12+
if (navigator.platform == "Linux x86_64") {os = "unix";}
13+
if (navigator.platform == "Linux i686") {os = "unix";}
14+
if (navigator.platform == "Linux i686 on x86_64") {os = "unix";}
15+
if (navigator.platform == "Linux aarch64") {os = "unix";}
16+
if (navigator.platform == "Linux armv6l") {os = "unix";}
17+
if (navigator.platform == "Linux armv7l") {os = "unix";}
18+
if (navigator.platform == "Linux ppc64") {os = "unix";}
19+
if (navigator.platform == "Mac") {os = "unix";}
20+
if (navigator.platform == "Win32") {os = "win";}
21+
if (navigator.platform == "FreeBSD x86_64") {os = "unix";}
22+
if (navigator.platform == "FreeBSD amd64") {os = "unix";}
23+
if (navigator.platform == "NetBSD x86_64") {os = "unix";}
24+
if (navigator.platform == "NetBSD amd64") {os = "unix";}
25+
26+
if (navigator.platform == "Linux armv7l"
27+
&& navigator.appVersion.indexOf("Android") != -1 ) {
28+
os = "android";
29+
}
30+
31+
// I wish I knew by now, but I don't. Try harder.
32+
if (os == "unknown") {
33+
if (navigator.appVersion.indexOf("Win")!=-1) {os = "win";}
34+
if (navigator.appVersion.indexOf("Mac")!=-1) {os = "unix";}
35+
}
36+
37+
return os;
38+
}
39+
40+
function adjust_for_platform() {
41+
"use strict";
42+
43+
var platform = detect_platform();
44+
45+
var unix_div = document.getElementById("platform-instructions-unix");
46+
var win_div = document.getElementById("platform-instructions-win");
47+
var android_div = document.getElementById("platform-instructions-android");
48+
var unknown_div = document.getElementById("platform-instructions-unknown");
49+
var default_div = document.getElementById("platform-instructions-default");
50+
51+
unix_div.style.display = "none";
52+
win_div.style.display = "none";
53+
android_div.style.display = "none";
54+
unknown_div.style.display = "none";
55+
default_div.style.display = "none";
56+
57+
if (platform == "unix") {
58+
unix_div.style.display = "block";
59+
} else if (platform == "win") {
60+
win_div.style.display = "block";
61+
} else if (platform == "android") {
62+
android_div.style.display = "block";
63+
} else if (platform == "unknown") {
64+
unknown_div.style.display = "block";
65+
} else {
66+
default_div.style.display = "block";
67+
}
68+
69+
var platform_specific = document.getElementsByClassName("platform-specific");
70+
for (var el of platform_specific) {
71+
var el_is_not_win = el.className.indexOf("not-win") !== -1;
72+
var el_is_inline = el.tagName.toLowerCase() == "span";
73+
var el_visible_style = "block";
74+
if (el_is_inline) {
75+
el_visible_style = "inline";
76+
}
77+
if (platform == "win") {
78+
if (el_is_not_win) {
79+
el.style.display = "none";
80+
} else {
81+
el.style.display = el_visible_style;
82+
}
83+
} else {
84+
if (el_is_not_win) {
85+
el.style.display = el_visible_style;
86+
} else {
87+
el.style.display = "none";
88+
}
89+
}
90+
}
91+
}
92+
93+
function cycle_platform() {
94+
if (platform_override == null) {
95+
platform_override = "default";
96+
} else if (platform_override == "default") {
97+
platform_override = "unknown";
98+
} else if (platform_override == "unknown") {
99+
platform_override = "win";
100+
} else if (platform_override == "win") {
101+
platform_override = "unix";
102+
} else if (platform_override == "unix") {
103+
platform_override = "android";
104+
} else if (platform_override == "android") {
105+
platform_override = "default";
106+
}
107+
adjust_for_platform();
108+
}
109+
110+
function set_up_cycle_button() {
111+
var cycle_button = document.getElementById("platform-button");
112+
cycle_button.onclick = cycle_platform;
113+
114+
var key="test";
115+
var idx=0;
116+
var unlocked=false;
117+
118+
document.onkeypress = function(event) {
119+
if (event.key == "n" && unlocked) {
120+
cycle_platform();
121+
}
122+
123+
if (event.key == key[idx]) {
124+
idx += 1;
125+
126+
if (idx == key.length) {
127+
cycle_button.style.display = "block";
128+
unlocked = true;
129+
cycle_platform();
130+
}
131+
} else if (event.key == key[0]) {
132+
idx = 1;
133+
} else {
134+
idx = 0;
135+
}
136+
};
137+
}
138+
139+
function fill_in_bug_report_values() {
140+
var nav_plat = document.getElementById("nav-plat");
141+
var nav_app = document.getElementById("nav-app");
142+
nav_plat.textContent = navigator.platform;
143+
nav_app.textContent = navigator.appVersion;
144+
}
145+
146+
(function () {
147+
adjust_for_platform();
148+
set_up_cycle_button();
149+
fill_in_bug_report_values();
150+
}());

‎_layouts/basic.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
</li>
2828
<li class="col-xs-12 col-md-10 menu">
2929
<h2><a href="/en-US/documentation.html">Documentation</a></h2>
30+
<h2><a href="/en-US/install.html">Install</a></h2>
3031
<h2><a href="/en-US/community.html">Community</a></h2>
31-
<h2><a href="/en-US/downloads.html">Downloads</a></h2>
3232
<h2><a href="/en-US/contribute.html">Contribute</a></h2>
3333
</li>
3434
</ul>

‎_layouts/fr/basic.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
</li>
2828
<li class="col-xs-12 col-md-10 menu">
2929
<h2><a href="/fr/documentation.html">Documentation</a></h2>
30+
<h2><a href="/fr/install.html">Install</a></h2>
3031
<h2><a href="/fr/community.html">Communauté</a></h2>
31-
<h2><a href="/fr/downloads.html">Télécharger</a></h2>
3232
<h2><a href="/fr/contribute.html">Contribuer</a></h2>
3333
</li>
3434
</ul>

‎_layouts/ko-KR/basic.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
</li>
2828
<li class="col-xs-12 col-md-10 menu">
2929
<h2><a href="/ko-KR/documentation.html">문서</a></h2>
30+
<h2><a href="/ko-KR/install.html">Install</a></h2>
3031
<h2><a href="/ko-KR/community.html">커뮤니티</a></h2>
31-
<h2><a href="/ko-KR/downloads.html">다운로드</a></h2>
3232
<h2><a href="/ko-KR/contribute.html">기여하기</a></h2>
3333
</li>
3434
</ul>

‎_layouts/pt-BR/basic.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<meta name="viewport" content="width=device-width, initial-scale=1">
88
<title>{{ page.title }}</title>
99
<meta name="keywords" content="Rust, Rust programming language, Linguagem de programação Rust, rustlang, rust-lang, Mozilla Rust">
10-
<meta name="description" content="Uma linguagem de programação de sistemas que roda incrivelmente rápido, previne segmentation fauls e garante segurança entre threads.">
10+
<meta name="description" content="Uma linguagem de programação de sistemas que roda incrivelmente rápido, previne falhas de segmentação e garante segurança entre threads.">
1111

1212
<link rel="stylesheet" href="/css/bootstrap.css">
1313
<link rel="stylesheet" href="/css/style.css">
@@ -27,8 +27,8 @@
2727
</li>
2828
<li class="col-xs-12 col-md-10 menu">
2929
<h2><a href="/pt-BR/documentation.html">Documentação</a></h2>
30+
<h2><a href="/pt-BR/install.html">Instale</a></h2>
3031
<h2><a href="/pt-BR/community.html">Comunidade</a></h2>
31-
<h2><a href="/pt-BR/downloads.html">Downloads</a></h2>
3232
<h2><a href="/pt-BR/contribute.html">Contribua</a></h2>
3333
</li>
3434
</ul>
@@ -38,7 +38,7 @@ <h2><a href="/pt-BR/contribute.html">Contribua</a></h2>
3838

3939
<footer>
4040
<p>Nosso site em outros idiomas:
41-
<a href="/en-US/">English</a>
41+
<a href="/en-US/">English</a>,
4242
<a href="/fr/">Français</a>,
4343
<a href="/ko-KR/">한국어</a>,
4444
<a href="/ru-RU/">Русский</a>,

‎_layouts/ru-RU/basic.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
</li>
2828
<li class="col-xs-12 col-md-10 menu">
2929
<h2><a href="/ru-RU/documentation.html">Документация</a></h2>
30+
<h2><a href="/ru-RU/install.html">Install</a></h2>
3031
<h2><a href="/ru-RU/community.html">Сообщество</a></h2>
31-
<h2><a href="/ru-RU/downloads.html">Загрузки</a></h2>
3232
<h2><a href="/ru-RU/contribute.html">Участие</a></h2>
3333
</li>
3434
</ul>

‎_layouts/zh-CN/basic.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
</li>
2828
<li class="col-xs-12 col-md-10 menu">
2929
<h2><a href="/zh-CN/documentation.html">文档</a></h2>
30+
<h2><a href="/zh-CN/install.html">Install</a></h2>
3031
<h2><a href="/zh-CN/community.html">社区</a></h2>
31-
<h2><a href="/zh-CN/downloads.html">下载</a></h2>
3232
<h2><a href="/zh-CN/contribute.html">贡献</a></h2>
3333
</li>
3434
</ul>

0 commit comments

Comments
 (0)