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

Commit cded8a5

Browse files
34428535613442853561
authored
Merge pull request #9 from rust-lang/master
17.3.23.9.51
2 parents e8cb193 + 3067d00 commit cded8a5

Some content is hidden

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

58 files changed

+1323
-372
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.15.1"
3-
stable_date: "2017-02-09"
4-
stable_blog: "https://blog.rust-lang.org/2017/02/09/Rust-1.15.1.html"
5-
stable_full_version: "rustc 1.15.1 (021bd294c 2017-02-08)"
6-
beta: "1.16"
7-
beta_date: "2017-03-16"
8-
nightly: "1.17"
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"
99
channels:
1010
- name: "stable"
11-
vers: "1.15.1"
12-
package: "1.15.1"
11+
vers: "1.16.0"
12+
package: "1.16.0"
1313
- name: "beta"
14-
vers: "1.16"
14+
vers: "1.17"
1515
package: "beta"
1616
- name: "nightly"
17-
vers: "1.17"
17+
vers: "1.18"
1818
package: "nightly"

‎_data/team.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ people:
4949
eddyb:
5050
name: Eduard Burtescu
5151
edunham:
52-
name: Emily Dunham
52+
name: E. Dunham
5353
erickt:
5454
name: Erick Tryzelaar
5555
frewsxcv:

‎_data/users.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,3 +307,8 @@
307307
url: https://www.xero.com
308308
logo: xero.png
309309
how: "Infrastructure for beautiful accounting software."
310+
-
311+
name: AdHawk
312+
url: https://www.tryadhawk.com
313+
logo: adhawk.png
314+
how: "We use Rust to parse all of our User-Agent headers."

‎_includes/vi-VN/example.rs

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// Bạn có thể edit và run code trực tiếp!
2+
fn main() {
3+
// A simple integer calculator:
4+
// `+` or `-` means add or subtract by 1
5+
// `*` or `/` means multiply or divide by 2
6+
7+
let program = "+ + * - /";
8+
let mut accumulator = 0;
9+
10+
for token in program.chars() {
11+
match token {
12+
'+' => accumulator += 1,
13+
'-' => accumulator -= 1,
14+
'*' => accumulator *= 2,
15+
'/' => accumulator /= 2,
16+
_ => {
17+
// ignore everything else
18+
}
19+
}
20+
}
21+
22+
println!("The program \"{}\" calculates the value {}",
23+
program,
24+
accumulator);
25+
}

‎_includes/vi-VN/example.rs.html

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<pre class='rust'>
2+
<span class='kw'>fn</span> main() {
3+
<span class='comment'>// A simple integer calculator:
4+
// `+` or `-` means add or subtract by 1
5+
// `*` or `/` means multiply or divide by 2</span>
6+
7+
<span class='kw'>let</span> program = <span class='string'>"+ + * - /"</span>;
8+
<span class='kw'>let</span> <span class='kw'>mut</span> accumulator = <span class='number'>0</span>;
9+
10+
<span class='kw'>for</span> token in program.chars() {
11+
<span class='kw'>match</span> token {
12+
<span class='string'>'+'</span> => accumulator <span class='op'>+=</span> <span class='number'>1</span>,
13+
<span class='string'>'-'</span> => accumulator <span class='op'>-=</span> <span class='number'>1</span>,
14+
<span class='string'>'*'</span> => accumulator <span class='op'>*=</span> <span class='number'>2</span>,
15+
<span class='string'>'/'</span> => accumulator <span class='op'>/=</span> <span class='number'>2</span>,
16+
_ => { <span class='comment'>/* ignore everything else */</span> }
17+
}
18+
}
19+
20+
<span class='prelude-val'>println!</span>(<span class='string'>"The program \"{}\" calculates the value {}"</span>,
21+
program, accumulator);
22+
}
23+
</pre>

‎en-US/community.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,9 @@ We have two forums for asynchronous discussion:
141141

142142
## YouTube Channel
143143

144-
Rust has an [YouTube channel][youtube_channel] where video material about the
145-
language programming is uploaded. What you can expect are recorded presentations
146-
held by members of the Rust community from various conferences.
144+
Rust has a [YouTube channel][youtube_channel] where presentations
145+
given at user groups and conferences by members of the Rust community
146+
are uploaded.
147147

148148
[youtube_channel]: https://www.youtube.com/channel/UCaYhcUwRBNscFNUKTjgPFiA
149149

‎en-US/user-groups.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ website](https://github.com/rust-lang/rust-www/blob/master/en-US/user-groups.md)
3939

4040
[Rust Floripa](https://www.meetup.com/Rust-Floripa/), Florianópolis.
4141

42-
[Rust in POA](https://www.meetup.com/Rust-in-POA/), Porto Alegre.
42+
[Rust in POA](https://www.meetup.com/Rust-in-POA/), Porto Alegre.
4343

4444
[Rust Rio](https://www.meetup.com/Rust-Rio/), Rio de Janeiro.
4545

@@ -59,6 +59,10 @@ website](https://github.com/rust-lang/rust-www/blob/master/en-US/user-groups.md)
5959

6060
[Lambda Zagreb](https://www.meetup.com/lambdazagreb/), Zagreb.
6161

62+
## Colombia
63+
64+
[Rust Colombia](https://www.meetup.com/rust-colombia/), Bogotá.
65+
6266
## Czech Republic
6367

6468
[Rust Prague](https://www.meetup.com/rust-prague/), Prague.
@@ -108,6 +112,8 @@ Budapest.
108112

109113
## Indonesia
110114

115+
[Rust Indonesia](https://github.com/rustid/meetup), Yogyakarta.
116+
111117
[Lambda Jakarta](https://www.meetup.com/Lambda-Jakarta/), Jakarta.
112118

113119
## Ireland

‎es-ES/contribute-bugs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
layout: default
2+
layout: es-ES/default
33
title: Contributing to Rust &mdash; finding, triaging and fixing issues &middot; The Rust Programming Language
44
---
55

‎es-ES/contribute-community.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
layout: default
2+
layout: es-ES/default
33
title: Contributing to Rust &mdash; community building &middot; The Rust Programming Language
44
---
55

‎es-ES/contribute-compiler.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
layout: default
2+
layout: es-ES/default
33
title: Contributing to Rust &mdash; language, compiler, and the standard library &middot; The Rust Programming Language
44
---
55

‎es-ES/contribute-docs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
layout: default
2+
layout: es-ES/default
33
title: Contributing to Rust &mdash; documentation &middot; The Rust Programming Language
44
---
55

‎es-ES/contribute-libs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
layout: default
2+
layout: es-ES/default
33
title: Contributing to Rust &mdash; libraries &middot; The Rust Programming Language
44
---
55

‎es-ES/contribute-tools.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
layout: default
2+
layout: es-ES/default
33
title: Contributing to Rust &mdash; tooling, IDEs and infrastructure &middot; The Rust Programming Language
44
---
55

‎es-ES/contribute-translations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
layout: default
2+
layout: es-ES/default
33
title: Translating rust-lang.org to other languages to adapt internationalization
44
---
55

‎es-ES/contribute.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
layout: default
2+
layout: es-ES/default
33
title: Contributing to Rust &middot; The Rust Programming Language
44
---
55

‎es-ES/faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
layout: faq
2+
layout: es-ES/faq
33
title: Frequently Asked Questions &middot; The Rust Programming Language
44
---
55

‎es-ES/legal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
layout: default
2+
layout: es-ES/default
33
title: Rust Legal Policies &middot; The Rust Programming Language
44
---
55

‎es-ES/other-installers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
layout: default
2+
layout: es-ES/default
33
title: Other Installation Methods &middot; The Rust Programming Language
44
---
55

‎es-ES/security.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: es-ES/default
33
title: Rust Security Policy &middot; The Rust Programming Language
44
---
55

0 commit comments

Comments
 (0)