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

Commit df8b88c

Browse files
authored
Merge pull request #5 from rust-lang/master
17.2.25.2.0
2 parents 712d355 + 9611003 commit df8b88c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1159
-1351
lines changed

_data/team.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ teams:
146146
lead: nikomatsakis
147147
- name: Tooling and infrastructure
148148
responsibility: "tool support (e.g. Cargo, rustup), CI infrastructure, etc."
149-
members: [japaric, brson, nrc, alexcrichton, vadimcn, wycats, michaelwoerister]
149+
members: [japaric, brson, nrc, alexcrichton, vadimcn, wycats, carols10cents, michaelwoerister]
150150
lead: alexcrichton
151151
- name: Community team
152152
responsibility: "coordinating events, outreach, commercial users, teaching materials, and exposure"

_data/users.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,11 @@
107107
url: https://www.clever-cloud.com/
108108
logo: clever-cloud.svg
109109
how: "We <a href='https://www.clever-cloud.com/doc/rust/rust/'>host Rust web applications</a>, and a part of our infrastructure is developed in Rust."
110+
-
111+
name: CodePicnic
112+
url: https://codepicnic.com
113+
logo: codepicnic.png
114+
how: "We provide Rust <a href='https://codepicnic.com/posts/console-of-the-day-rust-f7664060cc52bc6f3d620bcedc94a4b6/?utm_source=twitter&utm_medium=blog&utm_term=codepicnic+rust&utm_campaign=codepicnic_features_201702'>sandboxes</a> people can play around with, as well as fork to expand examples and apps they want to."
110115
-
111116
name: Coursera
112117
url: https://www.coursera.org
@@ -257,6 +262,11 @@
257262
url: https://stratumsecurity.com/
258263
logo: stratum.png
259264
how: "Data exfiltration testing and Application Security."
265+
-
266+
name: Telenor Digital
267+
url: https://www.telenordigital.com/
268+
logo: telenordigital.png
269+
how: "Increasing performance and reliability of a concurrent webhook delivery service."
260270
-
261271
name: Tessel
262272
url: https://www.tessel.io
@@ -285,8 +295,8 @@
285295
-
286296
name: Wire
287297
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."
298+
logo: wire.svg
299+
how: "<a href='https://github.com/wireapp/proteus'>Wire's Axolotl protocol implementation and other cryptographic and utility libraries</a> are developed in Rust, then cross-compiled for iOS and Android."
290300
-
291301
name: Xero
292302
url: https://www.xero.com

_includes/ja-JP/example.rs

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
// This code is editable and runnable!
1+
// このコードは編集して実行出来ます!
22
fn main() {
3-
// A simple integer calculator:
4-
// `+` or `-` means add or subtract by 1
5-
// `*` or `/` means multiply or divide by 2
3+
// 簡単な整数電卓:
4+
// `+` は1足す、、`-` は1引く
5+
// `*` は2掛ける、`/` は2割る
66

77
let program = "+ + * - /";
88
let mut accumulator = 0;
@@ -13,10 +13,11 @@ fn main() {
1313
'-' => accumulator -= 1,
1414
'*' => accumulator *= 2,
1515
'/' => accumulator /= 2,
16-
_ => { /* ignore everything else */ }
16+
_ => { /* 他の全ては無視 */ }
1717
}
1818
}
1919

20-
println!("The program \"{}\" calculates the value {}",
21-
program, accumulator);
20+
println!("プログラム \"{}\" の計算結果は {}。",
21+
program,
22+
accumulator);
2223
}

_includes/ja-JP/example.rs.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<pre class='rust'>
22
<span class='kw'>fn</span> main() {
33
<span class='comment'>// A simple integer calculator:
4-
// `+` or `-` means add or subtract by 1
5-
// `*` or `/` means multiply or divide by 2</span>
4+
// `+` は1足す、、`-` は1引く
5+
// `*` は2掛ける、`/` は2割る</span>
66

77
<span class='kw'>let</span> program = <span class='string'>"+ + * - /"</span>;
88
<span class='kw'>let</span> <span class='kw'>mut</span> accumulator = <span class='number'>0</span>;
@@ -13,11 +13,11 @@
1313
<span class='string'>'-'</span> => accumulator <span class='op'>-=</span> <span class='number'>1</span>,
1414
<span class='string'>'*'</span> => accumulator <span class='op'>*=</span> <span class='number'>2</span>,
1515
<span class='string'>'/'</span> => accumulator <span class='op'>/=</span> <span class='number'>2</span>,
16-
_ => { <span class='comment'>/* ignore everything else */</span> }
16+
_ => { <span class='comment'>/* 他の全ては無視 */</span> }
1717
}
1818
}
1919

20-
<span class='prelude-val'>println!</span>(<span class='string'>"The program \"{}\" calculates the value {}"</span>,
20+
<span class='prelude-val'>println!</span>(<span class='string'>"プログラム \"{}\" の計算結果は {}。"</span>,
2121
program, accumulator);
2222
}
2323
</pre>

_layouts/fr-FR/basic.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</li>
2828
<li class="col-xs-12 col-md-10 menu">
2929
<h2><a href="/fr-FR/documentation.html">Documentation</a></h2>
30-
<h2><a href="/fr-FR/install.html">Install</a></h2>
30+
<h2><a href="/fr-FR/install.html">Installer</a></h2>
3131
<h2><a href="/fr-FR/community.html">Communauté</a></h2>
3232
<h2><a href="/fr-FR/contribute.html">Contribuer</a></h2>
3333
</li>

_layouts/ja-JP/basic.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
<header>
2222
<ul class="row menu">
2323
<li class="col-xs-12 col-md-2">
24-
<a href="/ja-JP/index.html">
24+
<a href="/index.html">
2525
<img class="img-responsive" src="/logos/rust-logo-blk.svg" onerror="this.src='/logos/rust-logo-256x256-blk.png'" height="128" width="128" alt="Rust logo" />
2626
</a>
2727
</li>
2828
<li class="col-xs-12 col-md-10 menu">
29-
<h2><a href="/en-US/documentation.html">ドキュメンテーション</a></h2>
30-
<h2><a href="/en-US/install.html">インストール</a></h2>
31-
<h2><a href="/en-US/community.html">コミュニティ</a></h2>
32-
<h2><a href="/en-US/contribute.html">開発に参加する</a></h2>
29+
<h2><a href="/ja-JP/documentation.html">ドキュメント</a></h2>
30+
<h2><a href="/ja-JP/install.html">インストール</a></h2>
31+
<h2><a href="/ja-JP/community.html">コミュニティ</a></h2>
32+
<h2><a href="/ja-JP/contribute.html">開発に参加する</a></h2>
3333
</li>
3434
</ul>
3535
</header>

_layouts/ja-JP/faq.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
layout: default
2+
layout: ja-JP/default
33
---
44

55
<link href='https://fonts.googleapis.com/css?family=Source+Serif+Pro:400,600' rel='stylesheet' type='text/css'>

_layouts/pl-PL/basic.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<meta http-equiv="X-UA-Compatible" content="IE=edge">
77
<meta name="viewport" content="width=device-width, initial-scale=1">
88
<title>{{ page.title }}</title>
9-
<meta name="keywords" content="Rust, Rust programming language, Język Programowania Rust, rustlang, rust-lang, Mozilla Rust">
9+
<meta name="keywords" content="Rust, Rust programming language, Język programowania Rust, rustlang, rust-lang, Mozilla Rust">
1010
<meta name="description" content="Systemowy język programowania, który jest niesamowicie szybki, zapobiega naruszeniom pamięci oraz gwarantuje bezpieczeństwo wątków.">
1111

1212
<link rel="stylesheet" href="/css/bootstrap.css">
@@ -29,7 +29,7 @@
2929
<h2><a href="/pl-PL/documentation.html">Dokumentacja</a></h2>
3030
<h2><a href="/pl-PL/install.html">Instalacja</a></h2>
3131
<h2><a href="/pl-PL/community.html">Społeczność</a></h2>
32-
<h2><a href="/pl-PL/contribute.html">Wspomóż</a></h2>
32+
<h2><a href="/pl-PL/contribute.html">Współtwórz</a></h2>
3333
</li>
3434
</ul>
3535
</header>

_layouts/redirect.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
"en-US": "en-US",
1212
"fr": "fr",
1313
"fr-FR": "fr", // Prevents 404 on existing links
14+
"ja-JP": "ja-JP",
15+
"ja": "ja-JP",
1416
"ko": "ko-KR",
1517
"ko-KR": "ko-KR",
1618
"pl": "pl-PL",

en-US/faq.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ Things stabilize all the time, and the beta and stable channels update every six
148148
What are "Feature Gates"?
149149
</a></h3>
150150

151-
"Feature gates" are the mechanism Rust uses to stabilize features of the compiler, language, and standard library. A feature that is "gated" is accessible only on the nightly release channel, and then only when it has been explicitly enabled through `#[feature]` attributes or the `-Z unstable-options` command line argument. When a feature is stabilized it becomes available on the stable release channel, and does not need to be explicitly enabled. At that point the features is considered "ungated". Feature gates allow developers to test experimental features while they are under development, before they are available in the stable language.
151+
"Feature gates" are the mechanism Rust uses to stabilize features of the compiler, language, and standard library. A feature that is "gated" is accessible only on the nightly release channel, and then only when it has been explicitly enabled through `#[feature]` attributes or the `-Z unstable-options` command line argument. When a feature is stabilized it becomes available on the stable release channel, and does not need to be explicitly enabled. At that point the feature is considered "ungated". Feature gates allow developers to test experimental features while they are under development, before they are available in the stable language.
152152

153153
<h3><a href="#why-a-dual-mit-asl2-license" name="why-a-dual-mit-asl2-license">
154154
Why a dual MIT/ASL2 License?
@@ -740,7 +740,7 @@ What is "monomorphisation"?
740740
Monomorphisation specializes each use of a generic function (or structure) with specific instance,
741741
based on the parameter types of calls to that function (or uses of the structure).
742742

743-
During monomorphisisation a new copy of the generic function is translated for each unique set of types the function is instantiated with. This is the same strategy used by C++. It results in fast code that is specialized for every call-site and statically dispatched, with the tradeoff that functions instantiated with many different types can cause "code bloat", where multiple function instances result in larger binaries than would be created with other translation strategies.
743+
During monomorphisation a new copy of the generic function is translated for each unique set of types the function is instantiated with. This is the same strategy used by C++. It results in fast code that is specialized for every call-site and statically dispatched, with the tradeoff that functions instantiated with many different types can cause "code bloat", where multiple function instances result in larger binaries than would be created with other translation strategies.
744744

745745
Functions that accept [trait objects](https://doc.rust-lang.org/book/trait-objects.html) instead of type parameters do not undergo monomorphisation. Instead, methods on the trait objects are dispatched dynamically at runtime.
746746

en-US/user-groups.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ even better, open a pull request against
4444

4545
[Rust Toronto](https://www.meetup.com/Rust-Toronto/), Toronto.
4646

47+
## Denmark
48+
49+
[Copenhangen Rust Group](http://cph.rs), Copenhagen.
50+
4751
## France
4852

4953
[Lille Rust Meetup](https://www.meetup.com/rust-lille/), Lille.

es-ES/faq.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ Things stabilize all the time, and the beta and stable channels update every six
148148
What are "Feature Gates"?
149149
</a></h3>
150150

151-
"Feature gates" are the mechanism Rust uses to stabilize features of the compiler, language, and standard library. A feature that is "gated" is accessible only on the nightly release channel, and then only when it has been explicitly enabled through `#[feature]` attributes or the `-Z unstable-options` command line argument. When a feature is stabilized it becomes available on the stable release channel, and does not need to be explicitly enabled. At that point the features is considered "ungated". Feature gates allow developers to test experimental features while they are under development, before they are available in the stable language.
151+
"Feature gates" are the mechanism Rust uses to stabilize features of the compiler, language, and standard library. A feature that is "gated" is accessible only on the nightly release channel, and then only when it has been explicitly enabled through `#[feature]` attributes or the `-Z unstable-options` command line argument. When a feature is stabilized it becomes available on the stable release channel, and does not need to be explicitly enabled. At that point the feature is considered "ungated". Feature gates allow developers to test experimental features while they are under development, before they are available in the stable language.
152152

153153
<h3><a href="#why-a-dual-mit-asl2-license" name="why-a-dual-mit-asl2-license">
154154
Why a dual MIT/ASL2 License?
@@ -740,7 +740,7 @@ What is "monomorphisation"?
740740
Monomorphisation specializes each use of a generic function (or structure) with specific instance,
741741
based on the parameter types of calls to that function (or uses of the structure).
742742

743-
During monomorphisisation a new copy of the generic function is translated for each unique set of types the function is instantiated with. This is the same strategy used by C++. It results in fast code that is specialized for every call-site and statically dispatched, with the tradeoff that functions instantiated with many different types can cause "code bloat", where multiple function instances result in larger binaries than would be created with other translation strategies.
743+
During monomorphisation a new copy of the generic function is translated for each unique set of types the function is instantiated with. This is the same strategy used by C++. It results in fast code that is specialized for every call-site and statically dispatched, with the tradeoff that functions instantiated with many different types can cause "code bloat", where multiple function instances result in larger binaries than would be created with other translation strategies.
744744

745745
Functions that accept [trait objects](https://doc.rust-lang.org/book/trait-objects.html) instead of type parameters do not undergo monomorphisation. Instead, methods on the trait objects are dispatched dynamically at runtime.
746746

fr-FR/faq.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ Things stabilize all the time, and the beta and stable channels update every six
148148
What are "Feature Gates"?
149149
</a></h3>
150150

151-
"Feature gates" are the mechanism Rust uses to stabilize features of the compiler, language, and standard library. A feature that is "gated" is accessible only on the nightly release channel, and then only when it has been explicitly enabled through `#[feature]` attributes or the `-Z unstable-options` command line argument. When a feature is stabilized it becomes available on the stable release channel, and does not need to be explicitly enabled. At that point the features is considered "ungated". Feature gates allow developers to test experimental features while they are under development, before they are available in the stable language.
151+
"Feature gates" are the mechanism Rust uses to stabilize features of the compiler, language, and standard library. A feature that is "gated" is accessible only on the nightly release channel, and then only when it has been explicitly enabled through `#[feature]` attributes or the `-Z unstable-options` command line argument. When a feature is stabilized it becomes available on the stable release channel, and does not need to be explicitly enabled. At that point the feature is considered "ungated". Feature gates allow developers to test experimental features while they are under development, before they are available in the stable language.
152152

153153
<h3><a href="#why-a-dual-mit-asl2-license" name="why-a-dual-mit-asl2-license">
154154
Why a dual MIT/ASL2 License?
@@ -740,7 +740,7 @@ What is "monomorphisation"?
740740
Monomorphisation specializes each use of a generic function (or structure) with specific instance,
741741
based on the parameter types of calls to that function (or uses of the structure).
742742

743-
During monomorphisisation a new copy of the generic function is translated for each unique set of types the function is instantiated with. This is the same strategy used by C++. It results in fast code that is specialized for every call-site and statically dispatched, with the tradeoff that functions instantiated with many different types can cause "code bloat", where multiple function instances result in larger binaries than would be created with other translation strategies.
743+
During monomorphisation a new copy of the generic function is translated for each unique set of types the function is instantiated with. This is the same strategy used by C++. It results in fast code that is specialized for every call-site and statically dispatched, with the tradeoff that functions instantiated with many different types can cause "code bloat", where multiple function instances result in larger binaries than would be created with other translation strategies.
744744

745745
Functions that accept [trait objects](https://doc.rust-lang.org/book/trait-objects.html) instead of type parameters do not undergo monomorphisation. Instead, methods on the trait objects are dispatched dynamically at runtime.
746746

0 commit comments

Comments
 (0)