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

Commit 4486136

Browse files
authored
Merge pull request #27 from rust-lang/master
17.8.27.2.16
2 parents 1ad3c73 + 87ce9a6 commit 4486136

File tree

8 files changed

+37
-10
lines changed

8 files changed

+37
-10
lines changed

_data/team.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ people:
178178
teams:
179179
- name: Core team
180180
responsibility: "overall direction of the project, subteam leadership, cross-cutting concerns"
181-
members: [brson, nrc, alexcrichton, wycats, steveklabnik, nikomatsakis, carols10cents, aturon, erickt]
181+
members: [nrc, alexcrichton, wycats, steveklabnik, nikomatsakis, carols10cents, aturon, erickt]
182182
- name: Language team
183183
responsibility: "designing new language features"
184184
members: [withoutboats, eddyb, nrc, pnkfelix, nikomatsakis, aturon]
@@ -188,18 +188,18 @@ teams:
188188
members: [solson, joshtriplett, whitequark, cramertj, scottmcm]
189189
- name: Library team
190190
responsibility: "the Rust standard library, rust-lang crates, conventions, and ecosystem support"
191-
members: [brson, alexcrichton, sfackler, BurntSushi, Kimundi, dtolnay, aturon]
191+
members: [alexcrichton, sfackler, BurntSushi, Kimundi, dtolnay, aturon]
192192
lead: aturon
193193
- name: Library team shepherds
194194
responsibility: "coordinating the Libz Blitz, helping guide libs RFCs to completion, keeping pulse on the ecosystem"
195195
members: [KodrAus]
196196
- name: Compiler team
197197
responsibility: "compiler internals, optimizations"
198-
members: [arielb1, eddyb, nrc, petrochenkov, pnkfelix, nikomatsakis, aatch, jseyfried, michaelwoerister]
198+
members: [arielb1, eddyb, nrc, petrochenkov, pnkfelix, nikomatsakis, jseyfried, michaelwoerister]
199199
lead: nikomatsakis
200200
- name: Dev tools team
201201
responsibility: "overall direction for tools for working with Rust code"
202-
members: [japaric, brson, nrc, michaelwoerister, killercup, jonathandturner]
202+
members: [japaric, nrc, michaelwoerister, killercup, jonathandturner]
203203
lead: nrc
204204
- name: Dev tools peers
205205
responsibility: "oversight of specific Rust tools, and coordination with dev tools team"
@@ -211,13 +211,13 @@ teams:
211211
lead: aturon
212212
- name: Infrastructure team
213213
responsibility: "infrastructure supporting the Rust project itself: CI, releases, bots, metrics"
214-
members: [brson, alexcrichton, frewsxcv, shepmaster, aidanhs, TimNN, carols10cents, Mark-Simulacrum, erickt, aturon]
214+
members: [alexcrichton, shepmaster, aidanhs, TimNN, carols10cents, Mark-Simulacrum, erickt, aturon]
215215
lead: aturon
216216
217217
- name: Community team
218218
responsibility: "coordinating events, outreach, commercial users, teaching materials, and exposure"
219219
lead: erickt
220-
members: [brson, edunham, skade, manishearth, johannhof, sebasmagri, carols10cents, badboy, booyaa, bstrie, erickt, jonathandturner, ashleygwilliams]
220+
members: [edunham, skade, manishearth, johannhof, sebasmagri, carols10cents, badboy, booyaa, bstrie, erickt, jonathandturner, ashleygwilliams]
221221
222222
- name: Documentation team
223223
responsibility: "ensuring Rust has fantastic documentation"
@@ -227,13 +227,13 @@ teams:
227227
members: [mbrubeck, BurntSushi, manishearth, pnkfelix, niconii]
228228
229229
- name: Style team
230-
members: [brson, japaric, nrc, steveklabnik, ubsan, solson, joshtriplett]
230+
members: [japaric, nrc, steveklabnik, ubsan, solson, joshtriplett]
231231
lead: nrc
232232
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>)"
233233
234234
- name: Rust team alumni
235235
responsibility: "enjoying a leisurely retirement"
236-
members: [Gankro, pcwalton, huonw, peschkaj, dotdash, bkoropoff]
236+
members: [aatch, Gankro, pcwalton, huonw, peschkaj, dotdash, bkoropoff, brson]
237237
# Information on sites to get profile information from
238238
sites:
239239
github:

_data/usergroups.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,7 @@
412412
- Minnesota: MN
413413
- Nevada: NV
414414
- New York: NY
415+
- North Carolina: NC
415416
- Ohio: OH
416417
- Oregon: OR
417418
- Pennsylvania: PA
@@ -527,3 +528,9 @@
527528
city: Seattle
528529
state: WA
529530
url: https://www.meetup.com/Seattle-Rust-Meetup/
531+
532+
- name: Triangle Rustaceans
533+
city: Durham
534+
state: NC
535+
url: https://www.meetup.com/triangle-rustaceans/
536+

_data/users.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -472,3 +472,13 @@
472472
url: https://pressjitsu.com
473473
logo: pressjitsu.png
474474
how: "Pressjitsu is a managed WordPress hosting and service company. We use Rust in a handful of our backend systems, including logging routing and aggregation which needs to be fast and scalable."
475+
-
476+
name: Baidu X-Lab
477+
url: https://github.com/baidu/rust-sgx-sdk
478+
logo: baidu-x-lab.png
479+
how: "We provide Rust SGX SDK for developing Intel SGX enclaves in the Rust programming language."
480+
-
481+
name: CurrySoftware GmbH
482+
url: https://www.curry-software.com
483+
logo: curry-software.svg
484+
how: "Our multi-tenant On-Site Search CurrySearch is written with Rust from head to toe."

_includes/example.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ fn main() {
99
match num {
1010
0 => println!("This code is editable and runnable!"),
1111
1 => println!("¡Este código es editable y ejecutable!"),
12-
2 => println!("Ce code est modifiable et exécutable!"),
12+
2 => println!("Ce code est modifiable et exécutable !"),
1313
3 => println!("Questo codice è modificabile ed eseguibile!"),
1414
4 => println!("このコードは編集して実行出来ます!"),
1515
5 => println!("여기에서 코드를 수정하고 실행할 수 있습니다!"),

_includes/example.rs.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<span class='kw'>match</span> num {
99
0 => <span class='prelude-val'>println!</span>(<span class='string'>"This code is editable and runnable!"</span>),
1010
1 => <span class='prelude-val'>println!</span>(<span class='string'>"Este código es editable y ejecutable!"</span>),
11-
2 => <span class='prelude-val'>println!</span>(<span class='string'>"Ce code est modifiable et exécutable!"</span>),
11+
2 => <span class='prelude-val'>println!</span>(<span class='string'>"Ce code est modifiable et exécutable !"</span>),
1212
3 => <span class='prelude-val'>println!</span>(<span class='string'>"このコードは編集して実行出来ます!"</span>),
1313
4 => <span class='prelude-val'>println!</span>(<span class='string'>"这段代码是可以编辑并且能够运行的!"</span>),
1414
_ => {},

en-US/community.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ These channels are of the wider Rust community, and are not moderated by the [mo
109109
- [#rust-networking][networking_irc] is for people doing computer networking and development in Rust
110110
- [#rust-osdev][osdev_irc] is for people doing OS development in Rust
111111
- [#rust-sci][sci_irc] is for people doing scientific computing in Rust
112+
- [#rust-wasm][wasm_irc] is for discussion on using Rust with WebAssembly
112113
- [#rust-webdev][webdev_irc] is for people doing web development in Rust
113114
- [#hyper][hyper_irc] is for discussion on Hyper, a popular Rust http library
114115
- [#iron][iron_irc] is for discussion on Iron, the extensible Rust web framework
@@ -158,6 +159,7 @@ These channels are of the wider Rust community, and are not moderated by the [mo
158159
[rocket_irc]: https://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rocket
159160
[serde_irc]: https://chat.mibbit.com/?server=irc.mozilla.org&channel=%23serde
160161
[sci_irc]: https://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-sci
162+
[wasm_irc]: https://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-wasm
161163

162164
## Discussion Forums
163165

user-logos/baidu-x-lab.png

34.4 KB
Loading

user-logos/curry-software.svg

Lines changed: 8 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)