Merge pull request #12 from rust-lang/master

17.4.12.13.44

Author: 3442853561

_data/team.yml

@@ -131,7 +131,7 @@ people:
 teams:
   - name: Core team
     responsibility: "overall direction of the project, subteam leadership, cross-cutting concerns"
-    members: [brson, alexcrichton, wycats, steveklabnik, nikomatsakis, aturon, pcwalton, erickt]
+    members: [brson, alexcrichton, wycats, steveklabnik, nikomatsakis, aturon, erickt, carols10cents, nrc]
   - name: Language design team
     responsibility: "designing new language features"
     members: [eddyb, nrc, pnkfelix, nikomatsakis, aturon, withoutboats]
@@ -167,7 +167,7 @@ teams:
     email: [email protected]
   - name: Rust team alumni
     responsibility: "enjoying a leisurely retirement"
-    members: [Gankro, huonw]
+    members: [Gankro, huonw, pcwalton]
 
 # Information on sites to get profile information from
 sites:

_data/users.yml

@@ -162,6 +162,11 @@
   url: http://faraday.io
   logo: faraday.svg
   how: "<a href='https://github.com/faradayio/credentials_to_env'>Securely transferring credentials.</a>"
+-
+  name: GiGa infosystems GmbH
+  url: https://www.giga-infosystems.com
+  logo: giga.svg
+  how: "Rust serves us as our primary tool for rewriting our database for 3d geological models."
 -
   name: Gremlin Inc
   url: https://www.gremlininc.com
@@ -182,6 +187,11 @@
   url: https://line.me/
   logo: line.png
   how: "For a configuration agent."
+-
+  name: Linkerd
+  url: https://linkerd.io/
+  logo: linkerd.svg
+  how: "<a href='https://blog.buoyant.io/2017/03/29/introducing-linkerd-tcp/'>We're using Rust to extend the Linkerd Service Mesh with a lightweight TCP/TLS load balancer, linkerd-tcp.</a>"
 -
   name: Linki Tools
   url: http://linki.tools/

_includes/example.rs

@@ -1,22 +1,16 @@
-// This code is editable and runnable!
-fn main() {
-    // A simple integer calculator:
-    // `+` or `-` means add or subtract by 1
-    // `*` or `/` means multiply or divide by 2
+fn main() { 
+    let greetings = ["Hello", "Hola", "Bonjour",
+                     "こんにちは", "您好"];
 
-    let program = "+ + * - /";
-    let mut accumulator = 0;
-
-    for token in program.chars() {
-        match token {
-            '+' => accumulator += 1,
-            '-' => accumulator -= 1,
-            '*' => accumulator *= 2,
-            '/' => accumulator /= 2,
-            _ => { /* ignore everything else */ }
+    for (num, greeting) in greetings.iter().enumerate() {
+        println!("{}", greeting);
+        match num {
+            0 =>  println!("This code is editable and runnable!"),
+            1 =>  println!("Este código es editable y ejecutable!"),
+            2 =>  println!("Ce code est modifiable et exécutable!"),
+            3 =>  println!("このコードは編集して実行出来ます！"),
+            4 =>  println!("这段代码是可以编辑并且能够运行的！"),
+            _ =>  {},
         }
     }
-
-    println!("The program \"{}\" calculates the value {}",
-              program, accumulator);
 }

_includes/example.rs.html

@@ -1,23 +1,18 @@
 <pre class='rust'>
 <span class='kw'>fn</span> main() {
-<span class='comment'>// A simple integer calculator:
-// `+` or `-` means add or subtract by 1
-// `*` or `/` means multiply or divide by 2</span>
+    <span class='kw'>let</span> greetings = [<span class='string'>"Hello"</span>, <span class='string'>"Hola"<span>, <span class='string'>"Bonjour"</span>,
+                     <span class='string'>"こんにちは"</span>, <span class='string'>"您好"</span>];
 
-<span class='kw'>let</span> program = <span class='string'>"+ + * - /"</span>;
-<span class='kw'>let</span> <span class='kw'>mut</span> accumulator = <span class='number'>0</span>;
-
-<span class='kw'>for</span> token in program.chars() {
-<span class='kw'>match</span> token {
-    <span class='string'>'+'</span> => accumulator <span class='op'>+=</span> <span class='number'>1</span>,
-    <span class='string'>'-'</span> => accumulator <span class='op'>-=</span> <span class='number'>1</span>,
-    <span class='string'>'*'</span> => accumulator <span class='op'>*=</span> <span class='number'>2</span>,
-    <span class='string'>'/'</span> => accumulator <span class='op'>/=</span> <span class='number'>2</span>,
-    _ => { <span class='comment'>/* ignore everything else */</span> }
-}
-}
-
-<span class='prelude-val'>println!</span>(<span class='string'>"The program \"{}\" calculates the value {}"</span>,
-   program, accumulator);
+    <span class='kw'>for</span> (num, greeting) in greetings.iter().enumerate() {
+        <span class='prelude-val'>println!</span>(<span class='string'>"{}"</span>, greeting);
+        <span class='kw'>match</span> num {
+            0 =>  <span class='prelude-val'>println!</span>(<span class='string'>"This code is editable and runnable!"</span>),
+            1 =>  <span class='prelude-val'>println!</span>(<span class='string'>"Este código es editable y ejecutable!"</span>),
+            2 =>  <span class='prelude-val'>println!</span>(<span class='string'>"Ce code est modifiable et exécutable!"</span>),
+            3 =>  <span class='prelude-val'>println!</span>(<span class='string'>"このコードは編集して実行出来ます！"</span>),
+            4 =>  <span class='prelude-val'>println!</span>(<span class='string'>"这段代码是可以编辑并且能够运行的！"</span>),
+            _ =>  {},
+        }
+    }
 }
 </pre>

_includes/rustup.js

@@ -1,9 +1,5 @@
 var platform_override = null;
 
-function android_or_unix() {
-  return (navigator.appVersion.indexOf("Android") != -1) ? "android" : "unix";
-}
-
 function detect_platform() {
     "use strict";
 
@@ -14,11 +10,12 @@ function detect_platform() {
     var os = "unknown";
 
     if (navigator.platform == "Linux x86_64") {os = "unix";}
-    if (navigator.platform == "Linux i686") {os = android_or_unix();}
+    if (navigator.platform == "Linux i686") {os = "unix";}
     if (navigator.platform == "Linux i686 on x86_64") {os = "unix";}
-    if (navigator.platform == "Linux aarch64") {os = android_or_unix();}
-    if (navigator.platform == "Linux armv6l") {os = android_or_unix();}
-    if (navigator.platform == "Linux armv7l") {os = android_or_unix();}
+    if (navigator.platform == "Linux aarch64") {os = "unix";}
+    if (navigator.platform == "Linux armv6l") {os = "unix";}
+    if (navigator.platform == "Linux armv7l") {os = "unix";}
+    if (navigator.platform == "Linux armv8l") {os = "unix";}
     if (navigator.platform == "Linux ppc64") {os = "unix";}
     if (navigator.platform == "Linux mips") {os = "unix";}
     if (navigator.platform == "Linux mips64") {os = "unix";}
@@ -47,22 +44,18 @@ function adjust_for_platform() {
 
     var unix_div = document.getElementById("platform-instructions-unix");
     var win_div = document.getElementById("platform-instructions-win");
-    var android_div = document.getElementById("platform-instructions-android");
     var unknown_div = document.getElementById("platform-instructions-unknown");
     var default_div = document.getElementById("platform-instructions-default");
 
     unix_div.style.display = "none";
     win_div.style.display = "none";
-    android_div.style.display = "none";
     unknown_div.style.display = "none";
     default_div.style.display = "none";
 
     if (platform == "unix") {
         unix_div.style.display = "block";
     } else if (platform == "win") {
         win_div.style.display = "block";
-    } else if (platform == "android") {
-        android_div.style.display = "block";
     } else if (platform == "unknown") {
         unknown_div.style.display = "block";
     } else {
@@ -103,8 +96,6 @@ function cycle_platform() {
     } else if (platform_override == "win") {
         platform_override = "unix";
     } else if (platform_override == "unix") {
-        platform_override = "android";
-    } else if (platform_override == "android") {
         platform_override = "default";
     }
     adjust_for_platform();

css/style.css

@@ -246,13 +246,14 @@ ul.laundry-list {
   padding: none;
   margin: none;
   width: 100%;
-  min-height: 340px;
+  min-height: 300px;
   font-size: 13px;
   font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
   white-space: pre-wrap;
 }
 
 #active-code {
+  margin-top: 1rem;
   position: relative;
   display: none;
   padding: 10px;

en-US/install.html

@@ -19,19 +19,6 @@ <h1 class="rustup">Install Rust</h1>
           </p>
         </div>
 
-        <div id="platform-instructions-android" class="instructions" style="display: none;"> 
-         <p>It looks like you are running Android.</p>
-          <p>
-            The Rust compiler does not run on Android directly (yet),
-            but it does make it easy to cross-compile <em>to</em> Android.
-            Install Rust on a supported host platform and
-            <a href="https://github.com/rust-lang-nursery/rustup.rs/#cross-compilation">
-              follow the cross-compilation instructions
-            </a>
-            to build Rust applications for Android.
-          </p>
-        </div>
-
         <div id="platform-instructions-unknown" class="instructions" style="display: none;">
           <!-- unrecognized platform: ask for help -->
           <p>I don't recognize your platform.</p>
@@ -207,7 +194,7 @@ <h2>Other installation methods</h2>
         </p>
       </div>
     </div>
-    
+
     <script type="text/javascript">
       {% include rustup.js %}
     </script>

es-ES/install.html

@@ -19,28 +19,6 @@ <h1 class="rustup">Instalar Rust</h1>
           </p>
         </div>
 
-        <div id="platform-instructions-android" class="instructions" style="display: none;">
-         <p>Parece que estas ejecutando Android.</p>
-          <p>
-            The Rust compiler does not run on Android directly (yet),
-            but it does make it easy to cross-compile <em>to</em> Android.
-            Install Rust on a supported host platform and
-            <a href="https://github.com/rust-lang-nursery/rustup.rs/#cross-compilation">
-              follow the cross-compilation instructions
-            </a>
-            to build Rust applications for Android.
-          </p>
-          <p>
-            El compilador de Rust no se puede ejecutar directamente en Android (aún),
-            pero si puede compilar código <em>para</em> Android.
-            Instala Rust en una plataforma soportada y
-            <a href="https://github.com/rust-lang-nursery/rustup.rs/#cross-compilation">
-              sigue las instrucciones de <i>cross-compilation</i>
-            </a>
-            para compilar aplicaciones Rust para Android.
-          </p>
-        </div>
-
         <div id="platform-instructions-unknown" class="instructions" style="display: none;">
           <!-- unrecognized platform: ask for help -->
           <p>No reconozco tu plataforma.</p>

fr-FR/install.html

@@ -19,19 +19,6 @@ <h1 class="rustup">Installer Rust</h1>
           </p>
         </div>
 
-        <div id="platform-instructions-android" class="instructions" style="display: none;">
-         <p>Il semble que vous êtes sur Android.</p>
-          <p>
-            Le compilateur Rust ne tourne pas (encore) directement sur Android,
-	    mais il rend facile la cross-compilation <em>vers</em> Android.
-	    Installez Rust sur une plate-forme hôte supportée et
-            <a href="https://github.com/rust-lang-nursery/rustup.rs/#cross-compilation">
-              suivez les instructions de cross-compilation
-            </a>
-            pour compiler des applications Rust pour Android.
-          </p>
-        </div>
-
         <div id="platform-instructions-unknown" class="instructions" style="display: none;">
           <!-- unrecognized platform: ask for help -->
           <p>Je ne reconnais pas votre plate-forme.</p>

fr-FR/user-groups.md

@@ -4,6 +4,7 @@ title: Groupe d'utilisateurs Rust · Rust, le langage de programmation
 ---
 
 # Rust User Groups
+
 Dans le monde entier, il existe plus 50 groupes d'utilisateurs Rust représentant
 quelques 7000 membres répartis dans plus de 20 pays. Les Rustacéens se retrouvant
 périodiquement dans ces groupes d'utilisateur. C'est une bonne introduction pour se
@@ -64,6 +65,7 @@ mieux, de créer une Pull Request sur cette [forge GitHub](https://github.com/ru
 ## Danemark
 
 [Copenhangen Rust Group](http://cph.rs), Copenhagen.
+
 ## France
 
 [Lille Rust Meetup](https://www.meetup.com/rust-lille/), Lille.
@@ -77,6 +79,7 @@ mieux, de créer une Pull Request sur cette [forge GitHub](https://github.com/ru
 [Finland Rust-lang Group](https://www.meetup.com/Finland-Rust-Meetup/), Helsinki.
 
 ## Allemagne
+
 [Rust Cologne/Bonn User Group](https://www.meetup.com/Rust-Cologne-Bonn/), Köln.
 
 [Rust Berlin](https://www.meetup.com/Rust-Berlin/), Berlin.

it-IT/install.html

@@ -19,19 +19,6 @@ <h1 class="rustup">Installa Rust</h1>
           </p>
         </div>
 
-        <div id="platform-instructions-android" class="instructions" style="display: none;">
-         <p>Sembra che tu sia su un dispostivo Android.</p>
-          <p>
-            Il compilatore di Rust non funziona su Android direttamente (per ora)
-            ma permette di compilare facilmente <em>per</em> Android.
-            Installa Rust su una piattaforma supportata e
-            <a href="https://github.com/rust-lang-nursery/rustup.rs/#cross-compilation">
-              segui le istruzioni per la compilazione incrociata
-            </a>
-            per compilare applicazioni Rust per Android
-          </p>
-        </div>
-
         <div id="platform-instructions-unknown" class="instructions" style="display: none;">
           <!-- unrecognized platform: ask for help -->
           <p>Non ho riconosciuto la tua piattaforma.</p>

ja-JP/install.html

@@ -19,18 +19,6 @@ <h1 class="rustup">Rustのインストール</h1>
           </p>
         </div>
 
-        <div id="platform-instructions-android" class="instructions" style="display: none;"> 
-         <p>Androidをお使いのようですね。</p>
-          <p>
-            Rustのコンパイラは（まだ）Androidでは直接動きませんが、Android<em>へ</em>クロスコンパイルすることは簡単に出来ます。
-            Android向けのRustアプリケーションを作るにはRustをサポートされているプラットフォーム上でインストールして
-            <a href="https://github.com/rust-lang-nursery/rustup.rs/#cross-compilation">
-              クロスコンパイルのガイド
-            </a>
-            に従って下さい。
-          </p>
-        </div>
-
         <div id="platform-instructions-unknown" class="instructions" style="display: none;">
             <!-- unrecognized platform: ask for help -->
             <p>お使いのプラットフォームを認識出来ませんでした。</p>

ko-KR/install.html

@@ -19,18 +19,6 @@ <h1 class="rustup">Rust 설치</h1>
           </p>
         </div>
 
-        <div id="platform-instructions-android" class="instructions" style="display: none;"> 
-         <p>안드로이드를 사용하시는 듯 하네요.</p>
-          <p>
-            Rust 컴파일러는 (아직) 안드로이드에서 직접 동작하진 않지만,
-            안드로이드<em>로</em> 크로스컴파일하는 것은 쉽게 할 수 있습니다.
-            안드로이드용 Rust 애플리케이션을 빌드하려면
-            지원되는 호스트 플랫폼에서 Rust를 설치한 뒤
-            <a href="https://github.com/rust-lang-nursery/rustup.rs/#cross-compilation">
-              크로스컴파일 방법을 따르십시오</a>.
-          </p>
-        </div>
-
         <div id="platform-instructions-unknown" class="instructions" style="display: none;">
           <!-- unrecognized platform: ask for help -->
           <p>무슨 플랫폼을 사용하시는지 알아내지 못 했습니다.</p>

pl-PL/install.html

@@ -19,19 +19,6 @@ <h1 class="rustup">Zainstaluj Rusta</h1>
           </p>
         </div>
 
-        <div id="platform-instructions-android" class="instructions" style="display: none;">
-         <p>Wygląda na to, że używasz systemu Android.</p>
-          <p>
-            Kompilator Rusta nie działa na systemie Android bezpośrednio (jeszcze),
-            ale pozwala na prostą kompilację <em>na</em> system Android.
-            Zainstaluj Rusta na wspieranej platformie oraz
-            <a href="https://github.com/rust-lang-nursery/rustup.rs/#cross-compilation">
-              kieruj się instrukcjami kompilacji
-            </a>
-            aby zbudować aplikację napisaną w języku Rust na system Android.
-          </p>
-        </div>
-
         <div id="platform-instructions-unknown" class="instructions" style="display: none;">
           <p>Nie rozpoznaję Twojego systemu.</p>
           <p>

pt-BR/install.html

@@ -19,19 +19,6 @@ <h1 class="rustup">Instale Rust</h1>
           </p>
         </div>
 
-        <div id="platform-instructions-android" class="instructions" style="display: none;">
-         <p>Parece que você está usando Android.</p>
-          <p>
-            O compilador Rust não executa em Android diretamente (ainda),
-            mas ele facilita fazer compliação cruzada <em>para</em> Android.
-            Instale Rust em uma plataforma suportada e
-            <a href="https://github.com/rust-lang-nursery/rustup.rs/#cross-compilation">
-              siga as instruções de compilação cruzada
-            </a>
-            para construir aplicações Rust para Android.
-          </p>
-        </div>
-
         <div id="platform-instructions-unknown" class="instructions" style="display: none;">
           <!-- unrecognized platform: ask for help -->
           <p>Não reconheci sua plataforma.</p>
@@ -41,7 +28,7 @@ <h1 class="rustup">Instale Rust</h1>
             <a href="https://github.com/rust-lang/rust-www/issues/new">reporte um problema</a>,
             junto com os seguintes valores:
           </p>
-          
+
           <div>
             <div>navigator.platform:</div>
             <div id="nav-plat"></div>