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

Commit 4f62a22

Browse files
34428535613442853561
authored
Merge pull request #14 from rust-lang/master
17.4.29.17.19
2 parents 73ac314 + f1bd6d0 commit 4f62a22

28 files changed

+182
-97
lines changed

‎_config.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
name: The Rust Programming Language
2-
stable: "1.16.0"
3-
stable_date: "2017-03-16"
4-
stable_blog: "https://blog.rust-lang.org/2017/03/16/Rust-1.16.html"
5-
stable_full_version: "rustc 1.16.0 (30cf806ef 2017-03-10)"
6-
beta: "1.17"
7-
beta_date: "2017-04-27"
8-
nightly: "1.18"
2+
stable: "1.17.0"
3+
stable_date: "2017-04-27"
4+
stable_blog: "https://blog.rust-lang.org/2017/04/27/Rust-1.17.html"
5+
stable_full_version: "rustc 1.17.0 (56124baa9 2017-04-24)"
6+
beta: "1.18"
7+
beta_date: "2017-06-08"
8+
nightly: "1.19"
99
channels:
1010
- name: "stable"
11-
vers: "1.16.0"
12-
package: "1.16.0"
11+
vers: "1.17.0"
12+
package: "1.17.0"
1313
- name: "beta"
14-
vers: "1.17"
14+
vers: "1.18"
1515
package: "beta"
1616
- name: "nightly"
17-
vers: "1.18"
17+
vers: "1.19"
1818
package: "nightly"

‎_data/users.yml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,11 @@
117117
url: https://www.coursera.org
118118
logo: coursera.png
119119
how: "<a href='https://building.coursera.org/blog/2016/07/07/rust-docker-in-production-coursera/'>Programming Assignments</a> in <a href='http://betacs.pro/blog/2016/07/07/docker-and-rust/'>secured Docker containers</a>."
120+
-
121+
name: Coredump Hackerspace
122+
url: https://www.coredump.ch/
123+
logo: coredump.png
124+
how: "We develop <a href='https://github.com/coredump-ch/'>CLI tools, games and our backend infrastructure</a> and <a href='https://www.coredump.ch/tag/rust/'>organize events</a>"
120125
-
121126
name: Coturnix
122127
url: http://www.coturnix.fr/
@@ -279,7 +284,7 @@
279284
how: "Data exfiltration testing and Application Security."
280285
-
281286
name: Telenor Digital
282-
url: https://www.telenordigital.com/
287+
url: https://www.telenordigital.com/
283288
logo: telenordigital.png
284289
how: "Increasing performance and reliability of a concurrent webhook delivery service."
285290
-
@@ -322,3 +327,13 @@
322327
url: https://www.tryadhawk.com
323328
logo: adhawk.png
324329
how: "We use Rust to parse all of our User-Agent headers."
330+
-
331+
name: TreeScale
332+
url: https://www.treescale.com
333+
logo: treescale.png
334+
how: "At TreeScale we are implemented distributed PubSub system using Rust and MIO, which gave us 8x performance on for processing and distributing Container Images"
335+
-
336+
name: EVO.company
337+
url: https://evo.company
338+
logo: evo.company.svg
339+
how: "We have <a href='https://vagga.readthedocs.org'>development tools</a>, containerization, monitoring and orchestration systems in rust."

‎_includes/example.rs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,23 @@
11
fn main() {
22
let greetings = ["Hello", "Hola", "Bonjour",
3-
"こんにちは", "您好"];
3+
"Ciao", "こんにちは", "안녕하세요",
4+
"Cześć", "Olá", "Здравствуйте",
5+
"chào bạn", "您好"];
46

57
for (num, greeting) in greetings.iter().enumerate() {
6-
println!("{}", greeting);
8+
print!("{} : ", greeting);
79
match num {
810
0 => println!("This code is editable and runnable!"),
911
1 => println!("Este código es editable y ejecutable!"),
1012
2 => println!("Ce code est modifiable et exécutable!"),
11-
3 => println!("このコードは編集して実行出来ます！"),
12-
4 => println!("这段代码是可以编辑并且能够运行的！"),
13+
3 => println!("Questo codice è modificabile e eseguibile!"),
14+
4 => println!("このコードは編集して実行出来ます！"),
15+
5 => println!("여기에서 코드를 수정하고 실행할 수 있습니다!"),
16+
6 => println!("Ten kod można edytować oraz uruchomić!"),
17+
7 => println!("Esse código é editável e executável!"),
18+
8 => println!("Этот код можно отредактировать и запустить!"),
19+
9 => println!("Bạn có thể edit và run code trực tiếp!"),
20+
10 => println!("这段代码是可以编辑并且能够运行的！"),
1321
_ => {},
1422
}
1523
}

‎_includes/zh-CN/example.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 这个代码是可以编辑并且能够运行的
1+
// 这段代码是可以编辑并且能够运行的
22
fn main() {
33
// 一个简易计算器
44
// `+` 或 `-` 意味着加减1

‎en-US/user-groups.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ Budapest.
110110

111111
[Rust Group Coimbatore](https://github.com/dvigneshwer/Rust_Group_Coimbatore), Coimbatore.
112112

113+
[Rust Bangalore](https://twitter.com/rustox), Bangalore.
114+
113115
## Indonesia
114116

115117
[Rust Indonesia](https://github.com/rustid/meetup), Yogyakarta.
@@ -230,6 +232,8 @@ Budapest.
230232

231233
[Rust North](https://www.meetup.com/Rust-North/), Manchester.
232234

235+
[Cambridge Rust](https://www.meetup.com/Cambridge-Rust-Meetup/), Cambridge.
236+
233237
## Uruguay
234238

235239
[Rust Meetup Uruguay](https://www.meetup.com/Rust-Uruguay/), Montevideo.

‎es-ES/documentation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ temas, ejecutables en el navegador web.
2323

2424
[Preguntas frecuentes][faq].
2525

26-
[El Rustonomicon][nomicon]. Es un libroe entero dedicado a explicar como
26+
[El Rustonomicon][nomicon]. Es un libro entero dedicado a explicar como
2727
escribir código Rust inseguro. Esto es para programadores de Rust avanzados.
2828

2929
[rust-learning]. Una colección de recursos de aprendizaje mantenida por la

‎fr-FR/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ <h2>Fonctionnalités</h2>
3939
<div class="col-md-8">
4040
<div id="active-code">
4141
<button type="button" class="btn btn-primary btn-sm" id="run-code">Exécuter</button>
42-
<div id="editor">{% include fr-FR/example.rs %}</div>
42+
<div id="editor">{% include example.rs %}</div>
4343
<div id="result">
4444
<a id="playlink"><i class="icon-link-ext"></i></a>
4545
</div>
4646
</div>
47-
<div id="static-code">{% include fr-FR/example.rs.html %}</div>
47+
<div id="static-code">{% include example.rs.html %}</div>
4848
<div class="more-examples">
4949
<a href="http://rustbyexample.com/">Plus d’exemples</a>
5050
</div>

‎fr-FR/install.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ <h3>Windows considerations</h3>
184184
</div>
185185
</div>
186186

187-
<h2>Autres méthodes d'installation</h3>
187+
<h2>Autres méthodes d'installation</h2>
188188

189189
<div class="row">
190190
<div class="col-md-12">

‎it-IT/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ <h2>Caratteristiche:</h2>
4040
<div class="col-md-8">
4141
<div id="active-code">
4242
<button type="button" class="btn btn-primary btn-sm" id="run-code">Esegui</button>
43-
<div id="editor">{% include it-IT/example.rs %}</div>
43+
<div id="editor">{% include example.rs %}</div>
4444
<div id="result" data-msg-running="Running...">
4545
<a id="playlink"><i class="icon-link-ext"></i></a>
4646
</div>
4747
</div>
48-
<div id="static-code">{% include it-IT/example.rs.html %}</div>
48+
<div id="static-code">{% include example.rs.html %}</div>
4949
<div class="more-examples">
5050
<a href="http://rustbyexample.com/">Ulteriori esempi</a>
5151
</div>

‎it-IT/install.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ <h3>Considerazioni su Windows</h3>
187187
</div>
188188
</div>
189189

190-
<h2>Altri metodi di installazione</h3>
190+
<h2>Altri metodi di installazione</h2>
191191

192192
<div class="row">
193193
<div class="col-md-12">

‎ja-JP/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ <h2>特徴</h2>
3737
<div class="col-md-8">
3838
<div id="active-code">
3939
<button type="button" class="btn btn-primary btn-sm" id="run-code">実行</button>
40-
<div id="editor">{% include ja-JP/example.rs %}</div>
40+
<div id="editor">{% include example.rs %}</div>
4141
<div id="result" data-msg-running="実行中...">
4242
<a id="playlink"><i class="icon-link-ext"></i></a>
4343
</div>
4444
</div>
45-
<div id="static-code">{% include ja-JP/example.rs.html %}</div>
45+
<div id="static-code">{% include example.rs.html %}</div>
4646
<div class="more-examples">
4747
<a href="http://rustbyexample.com/">他の例</a>
4848
</div>

‎ko-KR/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ <h2>기능</h2>
4141
<div class="col-md-8">
4242
<div id="active-code">
4343
<button type="button" class="btn btn-primary btn-sm" id="run-code">실행</button>
44-
<div id="editor">{% include ko-KR/example.rs %}</div>
44+
<div id="editor">{% include example.rs %}</div>
4545
<div id="result" data-msg-running="실행 중...">
4646
<a id="playlink"><i class="icon-link-ext"></i></a>
4747
</div>
4848
</div>
49-
<div id="static-code">{% include ko-KR/example.rs.html %}</div>
49+
<div id="static-code">{% include example.rs.html %}</div>
5050
<div class="more-examples">
5151
<a href="http://rustbyexample.com/">더 많은 예제</a>
5252
</div>

‎ko-KR/install.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ <h3>윈도 한정</h3>
174174
</div>
175175
</div>
176176

177-
<h2>다른 설치 방법</h3>
177+
<h2>다른 설치 방법</h2>
178178

179179
<div class="row">
180180
<div class="col-md-12">

‎pl-PL/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ <h2>Zawiera</h2>
4040
<div class="col-md-8">
4141
<div id="active-code">
4242
<button type="button" class="btn btn-primary btn-sm" id="run-code">Uruchom</button>
43-
<div id="editor">{% include pl-PL/example.rs %}</div>
43+
<div id="editor">{% include example.rs %}</div>
4444
<div id="result" data-msg-running="Uruchamiam...">
4545
<a id="playlink"><i class="icon-link-ext"></i></a>
4646
</div>
4747
</div>
48-
<div id="static-code">{% include pl-PL/example.rs.html %}</div>
48+
<div id="static-code">{% include example.rs.html %}</div>
4949
<div class="more-examples">
5050
<a href="http://rustbyexample.com/">Więcej przykładów</a>
5151
</div>

‎pl-PL/install.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ <h3>Dotyczy Windowsa</h3>
160160
</div>
161161
</div>
162162

163-
<h2>Inne metody instalacji</h3>
163+
<h2>Inne metody instalacji</h2>
164164

165165
<div class="row">
166166
<div class="col-md-12">

‎pt-BR/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ <h2>Apresentando</h2>
4040
<div class="col-md-8">
4141
<div id="active-code">
4242
<button type="button" class="btn btn-primary btn-sm" id="run-code">Executar</button>
43-
<div id="editor">{% include pt-BR/example.rs %}</div>
43+
<div id="editor">{% include example.rs %}</div>
4444
<div id="result" data-msg-running="Executando...">
4545
<a id="playlink"><i class="icon-link-ext"></i></a>
4646
</div>
4747
</div>
48-
<div id="static-code">{% include pt-BR/example.rs.html %}</div>
48+
<div id="static-code">{% include example.rs.html %}</div>
4949
<div class="more-examples">
5050
<a href="http://rustbyexample.com/">Mais exemplos</a>
5151
</div>

‎pt-BR/install.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ <h3>Considerações no Windows</h3>
179179
</div>
180180
</div>
181181

182-
<h2>Outros métodos de instalação</h3>
182+
<h2>Outros métodos de instalação</h2>
183183

184184
<div class="row">
185185
<div class="col-md-12">

‎ru-RU/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ <h2>Возможности</h2>
3737
<div class="col-md-8">
3838
<div id="active-code">
3939
<button type="button" class="btn btn-primary btn-sm" id="run-code">Запустить</button>
40-
<div id="editor">{% include ru-RU/example.rs %}</div>
40+
<div id="editor">{% include example.rs %}</div>
4141
<div id="result">
4242
<a id="playlink"><i class="icon-link-ext"></i></a>
4343
</div>
4444
</div>
45-
<div id="static-code">{% include ru-RU/example.rs.html %}</div>
45+
<div id="static-code">{% include example.rs.html %}</div>
4646
<div class="more-examples">
4747
<a href="http://rustbyexample.com/">Больше примеров</a>
4848
</div>

‎ru-RU/install.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ <h3>Windows considerations</h3>
181181
</div>
182182
</div>
183183

184-
<h2>Other installation methods</h3>
184+
<h2>Other installation methods</h2>
185185

186186
<div class="row">
187187
<div class="col-md-12">

‎user-logos/coredump.png

102 KB
Loading

‎user-logos/evo.company.svg

Lines changed: 55 additions & 0 deletions
Loading

‎user-logos/treescale.png

44.2 KB
Loading

‎vi-VN/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ <h2>Các tính năng</h2>
3939
<div class="col-md-8">
4040
<div id="active-code">
4141
<button type="button" class="btn btn-primary btn-sm" id="run-code">Chạy thử Rust</button>
42-
<div id="editor">{% include vi-VN/example.rs %}</div>
42+
<div id="editor">{% include example.rs %}</div>
4343
<div id="result" data-msg-running="Đang chạy, chờ chút...">
4444
<a id="playlink"><i class="icon-link-ext"></i></a>
4545
</div>
4646
</div>
47-
<div id="static-code">{% include vi-VN/example.rs.html %}</div>
47+
<div id="static-code">{% include example.rs.html %}</div>
4848
<div class="more-examples">
4949
<a href="http://rustbyexample.com/">Khám phá chân trời mới</a>
5050
</div>

‎vi-VN/install.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ <h3>Đối với Windows</h3>
178178
</div>
179179
</div>
180180

181-
<h2>Cách cài đặt khác</h3>
181+
<h2>Cách cài đặt khác</h2>
182182

183183
<div class="row">
184184
<div class="col-md-12">

‎zh-CN/contribute.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ title: 为 Rust 语言做贡献 &middot; Rust 程序设计语言
88
您已经开始学习 Rust 语言。依恋它，想要与它相拥。
99
如果您不确定如何参与到贡献当中，这样页面可以帮助您。
1010

11-
**发现了一个大漏洞 (bug)，如何报告？** [漏洞报告指南][bugs]. 在此感谢您的建言。
11+
**发现了一个大漏洞 (bug)，如何报告？** [漏洞报告指南][bugs]。在此提前致谢！
1212

13-
Rust有一个庞大的项目系统，其中最突出的是由 [Rust 开发者][devs]在的GitHub上维护的[rust-lang][rust-lang]。
13+
Rust 有一个庞大的项目系统，其中最突出的是由 [Rust 开发者][devs]在的GitHub上维护的 [rust-lang 组织][rust-lang]。
1414
如果您刚刚开始贡献之旅，您可能对项目的 [CONTRIBUTING.md] 文件感兴趣，
1515
它解释了对 [rust-lang/rust] 的贡献的机制。
1616

@@ -23,12 +23,14 @@ Rust有一个庞大的项目系统，其中最突出的是由 [Rust 开发者][d
2323
不只限于官方文档——库、博客及其他非官方的消息来源。
2424
* [社区建设](contribute-community.html)
2525
帮助你在 Rust 中的手足同胞，以及壮大 Rust。
26-
* [工具、集成开发环境以及infrastructure](contribute-tools.html)：
26+
* [工具、集成开发环境以及基础设施](contribute-tools.html)：
2727
语言的实用与人性化是一门好的语言的关键所在。
2828
* [库](contribute-libs.html)：
2929
Rust 对任何特定任务的适用性主要取决于那些高质量库的可用性。
30-
* [语言、编译器和标准库](contribute-compiler.html)：
31-
语言设计、 功能实现、 性能的改善。
30+
* [语言、编译器和标准库](contribute-compiler.html)：
31+
语言设计、功能实现、性能的改善。
32+
* [国际化](contribute-translations.html)：
33+
通过翻译我们的网站至别的语言来传播 Rust。
3234

3335
如果您需要额外的指导请参考 [#rust-internals] 或 [internals.rust-lang.org]。
3436

0 commit comments

Comments
 (0)