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

Commit c29cbb3

Browse files
34428535613442853561
authored
Merge pull request #2 from rust-lang/master
16.9.30.11.33
2 parents 0cc3356 + da6c62f commit c29cbb3

35 files changed

+3428
-24
lines changed

‎.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ install:
1010
- pip install --user awscli
1111
- ~/.local/bin/aws configure set preview.cloudfront true
1212

13+
before_script: bash tidy.sh
14+
1315
# Build and deploy the site to the S3 bucket on push to master, unless PR
1416
script: bundle exec jekyll build
1517
branches:

‎_config.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: The Rust Programming Language
2-
stable: "1.11.0"
3-
stable_date: "2016-08-18"
4-
stable_blog: "/2016/08/18/Rust-1.11.html"
5-
beta: "1.12"
6-
beta_date: "2016-09-29"
7-
nightly: "1.13"
2+
stable: "1.12.0"
3+
stable_date: "2016-09-29"
4+
stable_blog: "/2016/09/29/Rust-1.12.html"
5+
beta: "1.13"
6+
beta_date: "2016-11-10"
7+
nightly: "1.14"

‎_data/users.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,11 @@
182182
url: https://snips.ai/
183183
logo: snips.svg
184184
how: "<a href='https://github.com/snipsco/rust-threshold-secret-sharing'>AI assistants that are private by design</a>."
185+
-
186+
name: Spoqa
187+
url: https://www.spoqa.com/
188+
logo: spoqa.png
189+
how: "Our POS integration SDK is entirely written in Rust."
185190
-
186191
name: Stratum Security
187192
url: https://stratumsecurity.com/

‎_includes/fr-FR/example.rs

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// Ce code est éditable et exécutable !
2+
fn main() {
3+
// Une calculatrice simple avec des entiers:
4+
// `+` ou `-` signifie ajouter ou soustraire 1
5+
// `*` ou `/` signifie multiplier ou diviser par 2
6+
7+
let programme = "+ + * - /";
8+
let mut accumulateur = 0;
9+
10+
for symbole in programme.chars() {
11+
match symbole {
12+
'+' => accumulateur += 1,
13+
'-' => accumulateur -= 1,
14+
'*' => accumulateur *= 2,
15+
'/' => accumulateur /= 2,
16+
_ => { /* on ne tient pas compte des autres symboles */ }
17+
}
18+
}
19+
20+
println!("Le programme \"{}\" a calculé la valeur {}",
21+
programme, accumulateur);
22+
}

‎_includes/fr-FR/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'>// Une calculatrice simple avec des entiers:
4+
// `+` ou `-` signifie ajouter ou soustraire 1
5+
// `*` ou `/` signifie multiplier ou diviser par 2</span>
6+
7+
<span class='kw'>let</span> programme = <span class='string'>"+ + * - /"</span>;
8+
<span class='kw'>let</span> <span class='kw'>mut</span> accumulateur = <span class='number'>0</span>;
9+
10+
<span class='kw'>for</span> symbole in programme.chars() {
11+
<span class='kw'>match</span> symbole {
12+
<span class='string'>'+'</span> => accumulateur <span class='op'>+=</span> <span class='number'>1</span>,
13+
<span class='string'>'-'</span> => accumulateur <span class='op'>-=</span> <span class='number'>1</span>,
14+
<span class='string'>'*'</span> => accumulateur <span class='op'>*=</span> <span class='number'>2</span>,
15+
<span class='string'>'/'</span> => accumulateur <span class='op'>/=</span> <span class='number'>2</span>,
16+
_ => { <span class='comment'>/* on ignore tout le reste */</span> }
17+
}
18+
}
19+
20+
<span class='prelude-val'>println!</span>(<span class='string'>"Le programme \"{}\" a calculé la valeur {}"</span>,
21+
programme, accumulateur);
22+
}
23+
</pre>

‎_layouts/basic.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ <h2><a href="/contribute.html">Contribute</a></h2>
4040
<p>Our site in other languages:
4141
<a href="/pt-BR/">Português</a>,
4242
<a href="/ru-RU/">Русский</a>,
43-
<a href="/zh-CN/">简体中文</a>
43+
<a href="/zh-CN/">简体中文</a>
44+
<a href="/fr-FR/">Français</a>
4445
</p>
4546
</footer>
4647

‎_layouts/fr-FR/basic.html

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
<!DOCTYPE html>
2+
<!-- Page last generated {{ site.time }} -->
3+
<html lang="fr">
4+
<head>
5+
<meta charset="utf-8">
6+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
7+
<meta name="viewport" content="width=device-width, initial-scale=1">
8+
<title>{{ page.title }}</title>
9+
<meta name="keywords" content="Rust, Rust programming language, langage de programmation Rust, rustlang, rust-lang, Mozilla Rust">
10+
<meta name="description" content="Un langage de programmation système ultra-rapide, qui prévient les erreurs de segmentations, et garantit la sûreté entre threads.">
11+
12+
<link rel="stylesheet" href="/css/bootstrap.css">
13+
<link rel="stylesheet" href="/css/style.css">
14+
</head>
15+
16+
<body class="container">
17+
<a href="https://github.com/rust-lang/rust">
18+
<img class="ribbon" style="display: none" src="/logos/forkme.png" alt="Fork me on GitHub" width="298" height="298">
19+
</a>
20+
21+
<header>
22+
<ul class="row menu">
23+
<li class="col-xs-12 col-md-2">
24+
<a href="/index.html">
25+
<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" />
26+
</a>
27+
</li>
28+
<li class="col-xs-12 col-md-10 menu">
29+
<h2><a href="/fr-FR/documentation.html">Documentation</a></h2>
30+
<h2><a href="/fr-FR/community.html">Communauté</a></h2>
31+
<h2><a href="/fr-FR/downloads.html">Téléchargements</a></h2>
32+
<h2><a href="/fr-FR/contribute.html">Contribuer</a></h2>
33+
</li>
34+
</ul>
35+
</header>
36+
37+
{{ content }}
38+
39+
<script>
40+
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
41+
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
42+
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
43+
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
44+
45+
ga('create', 'UA-58390457-1', 'auto');
46+
ga('send', 'pageview');
47+
48+
</script>
49+
</body>
50+
</html>

‎_layouts/fr-FR/default.html

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
layout: fr-FR/basic
3+
---
4+
5+
<div class="content">
6+
{{ content }}
7+
</div>

‎_layouts/redirect.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
"ru-RU": "ru-RU",
1616
"zh": "zh-CN",
1717
"zh-CN": "zh-CN",
18+
"fr": "fr-FR",
19+
"fr-FR": "fr-FR",
1820
};
1921

2022
// look up the provided language in the map

‎_layouts/zh-CN/basic.html

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!DOCTYPE html>
1+
<!DOCTYPE html>
22
<!-- Page last generated {{ site.time }} -->
33
<html lang="zh-CN">
44
<head>
@@ -36,6 +36,14 @@ <h2><a href="/contribute.html">贡献</a></h2>
3636

3737
{{ content }}
3838

39+
<footer>
40+
<p>外语页面：
41+
<a href="/en-US/">English</a>,
42+
<a href="/pt-BR/">Português</a>,
43+
<a href="/ru-RU/">Русский</a>
44+
</p>
45+
</footer>
46+
3947
<script>
4048
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
4149
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),

‎en-US/team.md

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@ people:
1414
irc: acrichto
1515
aturon:
1616
name: Aaron Turon
17+
badboy:
18+
name: Jan-Erik Rediger
1719
bkoropoff:
1820
name: Brian Koropoff
21+
booyaa:
22+
name: Mark Sta Ana
1923
brson:
2024
name: Brian Anderson
2125
bstrie:
@@ -44,9 +48,16 @@ people:
4448
GuillaumeGomez:
4549
name: Guillaume Gomez
4650
irc: imperio
51+
japaric:
52+
name: Jorge Aparicio
53+
johannhof:
54+
name: Johann Hofmann
4755
jonathandturner:
4856
name: Jonathan Turner
4957
irc: jntrnr
58+
joshtriplett:
59+
name: Josh Triplett
60+
irc: JoshTriplett
5061
jseyfried:
5162
name: Jeffrey Seyfried
5263
irc: jseyfried
@@ -80,20 +91,17 @@ people:
8091
name: Steven Fackler
8192
skade:
8293
name: Florian Gilcher
94+
solson:
95+
name: Scott Olson
96+
irc: scott
8397
steveklabnik:
8498
name: Steve Klabnik
8599
vadimcn:
86100
name: Vadim Chugunov
101+
ubsan:
102+
name: Nicole Mazzuca
87103
wycats:
88104
name: Yehuda Katz
89-
jonathandturner:
90-
name: Jonathan Turner
91-
badboy:
92-
name: Jan-Erik Rediger
93-
johannhof:
94-
name: Johann Hofmann
95-
booyaa:
96-
name: Mark Sta Ana
97105

98106
# Information about each team. Omit `lead` for teams without leaders.
99107
teams:
@@ -128,6 +136,11 @@ teams:
128136
responsibility: "helping uphold the <a href='https://www.rust-lang.org/conduct.html'>code of conduct</a>"
129137
members: [mbrubeck, BurntSushi, manishearth, pnkfelix, niconii]
130138
email: rust-mods@rust-lang.org
139+
- name: Style team
140+
members: [brson, japaric, joshtriplett, nrc, solson, steveklabnik, ubsan]
141+
lead: nrc
142+
responsibility: "temporary 'strike team' charged with deciding on code style guidelines and configuring Rustfmt (process specified in <a href='https://github.com/rust-lang/rfcs/blob/master/text/1607-style-rfcs.md'>RFC 1607</a>)"
143+
email: style-team@rust-lang.org
131144
- name: Rust team alumni
132145
responsibility: "enjoying a leisurely retirement"
133146
members: [Gankro, huonw]

0 commit comments

Comments
 (0)