Merge remote-tracking branch 'upstream/master'

Author: mkpankov

_config.yml

@@ -1,7 +1,7 @@
 name: The Rust Programming Language
 stable: "1.11.0"
-stable_date: "August 18, 2016"
+stable_date: "2016-08-18"
 stable_blog: "/2016/08/18/Rust-1.11.html"
 beta: "1.12"
-beta_date: "September 29, 2016"
+beta_date: "2016-09-29"
 nightly: "1.13"

_data/users.yml

@@ -51,7 +51,7 @@
   name: ANIXE
   url: http://www.anixe.pl/
   logo: anixe.png
-  how: "Building the next generation reservation systems for the travel industry."
+  how: "Building the next generation travel services trading platform in Rust."
 -
   name: AppSignal
   url: https://appsignal.com/
@@ -71,7 +71,7 @@
   name: Beget
   url: https://beget.com
   logo: beget.png
-  how: "As part of backup and resource management systems."
+  how: "As part of backup, resource management systems and <a href='https://github.com/LTD-Beget/syncookied'>DDOS mitigation</a>"
 -
   name: Coursera
   url: https://www.coursera.org
@@ -162,6 +162,11 @@
   url: https://www.getsentry.com/
   logo: sentry-horizontal-black.svg
   how: "<a href='http://lucumr.pocoo.org/2016/7/10/rust-rest/'>A command-line client for the Sentry API.</a>"
+-
+  name: Snips
+  url: https://snips.ai/
+  logo: snips.svg
+  how: "<a href='https://github.com/snipsco/rust-threshold-secret-sharing'>AI assistants that are private by design</a>."
 -
   name: Stratum Security
   url: https://stratumsecurity.com/

_includes/editor.js

@@ -23,6 +23,9 @@
   var errorColor = "#F6E2E2";
   var warningColor = "#FFFBCB";
 
+  // Message to show when the program is running
+  var runningMsg = resultDiv.getAttribute("data-msg-running") || "Running...";
+
   // Error message to return when there's a server failure
   var errMsg = "The server encountered an error while running the program.";
 
@@ -180,28 +183,38 @@
     // Getting list of ranges with problems
     var lines = message.split(newLineRegex);
 
-    // Cleaning up the message: keeps only relevant problem output
-    var cleanMessage = lines.map(function(line) {
-      if (line.startsWith("<anon>") || line.indexOf("^") !== -1) {
-        var errIndex = line.indexOf(problem + ": ");
-        if (errIndex !== -1) {return line.slice(errIndex);}
-        return "";
-      }
-
-      // Discard playpen messages, keep the rest
-      if (line.startsWith("playpen:")) {return "";}
-      return line;
-    }).filter(function(line) {
-      return line !== "";
+    // Cleaning up the message: keeps only relevant problem output.
+    var cleanMessage = lines.filter(function(line) {
+      return !line.trim().startsWith("--> <anon>")
+        && !line.startsWith("playpen:")
+        && !line.trim().startsWith("error: aborting");
     }).map(function(line) {
       return escapeHTML(line);
+    }).filter(function(line) {
+      return line != "";
+    }).map(function(line) {
+      return line.replace(/  /g, '\u00a0\u00a0');
     }).join("<br />");
 
+    // Get all of the row:col in the message.
+    var errorLines = lines.filter(function(line) {
+      return line.indexOf("--> <anon>") !== -1;
+    }).map(function(line) {
+      var lineIndex = line.indexOf(":");
+      if (lineIndex !== -1) {
+        return line.slice(lineIndex);
+      }
+
+      return "";
+    }).filter(function(line) {
+      return line != "";
+    });
+
     // Setting message
     displayOutput(cleanMessage, editor.getValue());
 
     // Highlighting the lines
-    var ranges = parseProblems(lines);
+    var ranges = parseProblems(errorLines);
     markers = ranges.map(function(range) {
       return editor.getSession().addMarker(range, "ace-" + problem + "-line",
         "fullLine", false);
@@ -220,12 +233,10 @@
     var ranges = [];
     for (var i in lines) {
       var line = lines[i];
-      if (line.startsWith("<anon>:") && line.indexOf(": ") !== -1) {
-        var parts = line.split(/:\s?|\s+/, 5).slice(1, 5);
-        var ip = parts.map(function(p) { return parseInt(p, 10) - 1; });
-        // console.log("line:", line, parts, ip);
-        ranges.push(new Range(ip[0], ip[1], ip[2], ip[3]));
-      }
+      var parts = line.split(/:\s?|\s+/, 5).slice(1, 5);
+      var ip = parts.map(function(p) { return parseInt(p, 10) - 1; });
+      console.log("line:", line, parts, ip);
+      ranges.push(new Range(ip[0], ip[1], ip[2], ip[3]));
     }
 
     return ranges;
@@ -235,7 +246,7 @@
   runButton.addEventListener("click", function(ev) {
     resultDiv.style.display = "block";
     clearResultDiv();
-    resultDiv.innerHTML = "Running...";
+    resultDiv.innerHTML = runningMsg;
 
     // clear previous markers, if any
     markers.map(function(id) { editor.getSession().removeMarker(id); });

_includes/set_platform.js

@@ -1,24 +1,6 @@
 (function () {
   "use strict";
 
-  // Returns the binary name for the given platform (Linux binary, Windows Installer, etc)
-  function binary_name(platform) {
-	var platforms = {
-		"en": {"linux": "Linux binary", "windows": "Windows Installer", "mac": "Mac Installer"},
-		"en-US": {"linux": "Linux binary", "windows": "Windows Installer", "mac": "Mac Installer"},
-		"pt": {"linux": "Binário Linux", "windows": "Instalador Windows", "mac": "Instalador Mac"},
-		"pt-BR": {"linux": "Binário Linux", "windows": "Instalador Windows", "mac": "Instalador Mac"},
-		"ru": {"linux": "Исполняемые файлы для Linux", "windows": "Установщик для Windows", "mac": "Установщик для Mac"},
-		"ru-RU": {"linux": "Исполняемые файлы для Linux", "windows": "Установщик для Windows", "mac": "Установщик для Mac"},
-		// Add more platforms here
-	};
-	return platforms[get_language()][platform];
-  }
-
-  function get_language() {
-	return window.navigator.language || window.navigator.userLanguage || "en";
-  }
-
   function detect_platform() {
     if (navigator.platform === "Linux i686") { return "i686-unknown-linux-gnu";}
     if (navigator.platform === "Linux x86_64") { return "x86_64-unknown-linux-gnu";}
@@ -41,24 +23,25 @@
   var rec_download_file = "rustc-{{ site.stable }}-src.tar.gz";
 
   if (platform == "x86_64-unknown-linux-gnu") {
-    rec_version_type = binary_name("linux");
+    rec_version_type = "linux";
     rec_download_file = "rust-" + rec_package_name + "-x86_64-unknown-linux-gnu.tar.gz";
   } else if (platform == "i686-unknown-linux-gnu") {
-    rec_version_type = binary_name("linux");
+    rec_version_type = "linux";
     rec_download_file = "rust-" + rec_package_name + "-i686-unknown-linux-gnu.tar.gz";
   } else if (platform == "x86_64-apple-darwin") {
-    rec_version_type = binary_name("mac");
+    rec_version_type = "mac";
     rec_download_file = "rust-" + rec_package_name + "-x86_64-apple-darwin.pkg";
   } else if (platform == "x86_64-pc-windows-gnu") {
-    rec_version_type = binary_name("windows");
+    rec_version_type = "windows";
     rec_download_file = "rust-" + rec_package_name + "-x86_64-pc-windows-gnu.msi";
   } else if (platform == "i686-pc-windows-gnu") {
-    rec_version_type = binary_name("windows");
+    rec_version_type = "windows";
     rec_download_file = "rust-" + rec_package_name + "-i686-pc-windows-gnu.msi";
   }
 
-  var rec_package_desc = rec_package_name + " (<span>" + rec_version_type + "</span>)";
   var rec_vers_div = document.getElementById("install-version");
+  var rec_vers_type_local = rec_vers_div.getAttribute('data-type-' + rec_version_type);
+  var rec_package_desc = rec_package_name + " (<span>" + (rec_vers_type_local || rec_version_type) + "</span>)";
   rec_vers_div.innerHTML = rec_package_desc;
 
   var rec_dl_addy = "https://static.rust-lang.org/dist/" + rec_download_file;

css/style.css

@@ -314,6 +314,8 @@ ul.laundry-list {
   padding: 10px;
   display: none;
   border-radius: 4px;
+  font-family: monospace;
+  font-size: 12px;
 }
 
 .ace-error-text, .ace-error-line, .ace-warning-text, .ace-warning-line {

en-US/downloads.html

@@ -9,13 +9,12 @@ <h1>Downloads</h1>
     <div class="row install">
       <div class="col-md-4 side-header">
         <h2 id="stable">{{ site.stable }}&nbsp;</h2>
-        <h3>{{ site.stable_date }}</h3>
+        <h3>{{ site.stable_date | date: "%B %-d, %Y" }}</h3>
         <p>
 	  The
           <a href="http://blog.rust-lang.org{{ site.stable_blog }}">
-	    current stable release of Rust
-	  </a>
-	  , updated every six weeks and backwards-compatible.
+	    current stable release of Rust</a>,
+	  updated every six weeks and backwards-compatible.
         </p>
       </div>
       <div class="col-md-8">
@@ -65,7 +64,7 @@ <h2 id="beta">Beta&nbsp; ({{ site.beta }})</h2>
 	A preview of the upcoming stable release, intended for testing by
 	crate authors. Updated every six weeks and as needed.
         </p>
-        <p><em>Scheduled for stable release<br/>{{ site.beta_date }}</em>.<p>
+        <p><em>Scheduled for stable release<br/>{{ site.beta_date | date: "%B %-d, %Y" }}</em>.<p>
       </div>
       <div class="col-md-8">
         <table class="table-features table-installers"><tbody>

en-US/index.html

@@ -17,7 +17,11 @@
       <div class="col-md-4 install-box">
         <span class="version-rec-box-inner">
           Recommended Version:<br>
-          <span id="install-version">
+          <span id="install-version"
+                data-type-linux="Linux binary"
+                data-type-windows="Windows Installer"
+                data-type-mac="Mac Installer"
+                data-type-source="source">
             {{ site.stable }}
             (<span>source</span>)
           </span>
@@ -47,7 +51,7 @@ <h2>Featuring</h2>
         <div id="active-code">
           <button type="button" class="btn btn-primary btn-sm" id="run-code">Run</button>
           <div id="editor">{% include example.rs %}</div>
-          <div id="result">
+          <div id="result" data-msg-running="Running...">
             <a id="playlink"><i class="icon-link-ext"></i></a>
           </div>
         </div>

en-US/user-groups.md

@@ -10,11 +10,11 @@ with over 7,000 members. Rustaceans meet periodically in Rust User
 Groups.  Its a great introduction to the community and a great way to
 learn and socialize with other people with a similar interest.
 Meetings are usually informal and open to
-everyone. If you have started a new user group and with to add it to
+everyone. If you have started a new user group and wish to add it to
 this list, please contact the [Rust Community
 Team](./team.html#Community) or
 even better, open a pull request against
-[this website](https://github.com/rust-lang/rust-www/blob/master/user-groups.md).
+[this website](https://github.com/rust-lang/rust-www/blob/master/en-US/user-groups.md).
 
 ## Australia
 
@@ -26,6 +26,10 @@ even better, open a pull request against
 
 [Klagenfurt Rust Programmers](https://www.meetup.com/Klagenfurt-Rust/), Klagenfurt.
 
+## Bolivia
+
+[Rust Bolivia](http://www.mozillabolivia.org/rust/), Santa Cruz, Bolivia.
+
 ## Brazil
 
 [Rust São Paulo](https://www.meetup.com/Rust-Sao-Paulo-Meetup/), São Paulo.
@@ -148,32 +152,60 @@ even better, open a pull request against
 
 ## USA
 
-[The Austin Rust Meetup](https://www.meetup.com/Austin-Rust-Meetup/), Austin.
-
-[Chicago Rust Meetup](https://www.meetup.com/Chicago-Rust-Meetup/), Chicago, IL.
-
-[Columbus Rust Society](https://www.meetup.com/columbus-rs/), Columbus, OH.
+### Arizona
 
 [Desert Rust](https://www.meetup.com/Desert-Rustaceans/), Phoenix, AZ.
 
-[PDXRust](https://www.meetup.com/PDXRust/), Portland, OR.
+### California
 
 [Rust Bay Area](https://www.meetup.com/Rust-Bay-Area/), San Francisco, CA.
 
-[Rust Boston](https://www.meetup.com/Boston-Rust-Meetup-25317522aNpHwZdw/), Boston, MA.
+[Rust Learning Group](https://www.meetup.com/Rust-Learning-Group/), Oakland, CA.
+
+[Rust Los Angeles](https://www.meetup.com/Rust-Los-Angeles/), Los Angeles, CA.
+
+[San Diego Rust](https://www.meetup.com/San-Diego-Rust/), San Diego, CA.
+
+### Colorado
 
 [Rust Boulder/Denver](https://www.meetup.com/Rust-Boulder-Denver/), Boulder, CO.
 
+### Illinois
+
+[Chicago Rust Meetup](https://www.meetup.com/Chicago-Rust-Meetup/), Chicago, IL.
+
+### Massachussets
+
+[Rust Boston](https://www.meetup.com/Boston-Rust-Meetup-25317522aNpHwZdw/), Boston, MA.
+
+### Michigan
+
 [Rust Detroit](https://www.meetup.com/rust-detroit/), Detroit, MI.
 
-[Rust Learning Group](https://www.meetup.com/Rust-Learning-Group/), Oakland, CA.
+### Minnesota
 
-[Rust Los Angeles](https://www.meetup.com/Rust-Los-Angeles/), Los Angeles, CA.
+[Rust Twin Cities](https://www.meetup.com/Rust-TC/), Minneapolis, MN.
+
+### New York
 
 [Rust NYC](https://www.meetup.com/Rust-NYC/), New York, NY
 
-[Rust Twin Cities](https://www.meetup.com/Rust-TC/), Minneapolis, MN.
+### Ohio
 
-[San Diego Rust](https://www.meetup.com/San-Diego-Rust/), San Diego, CA.
+[Columbus Rust Society](https://www.meetup.com/columbus-rs/), Columbus, OH.
+
+### Oregon
+
+[PDXRust](https://www.meetup.com/PDXRust/), Portland, OR.
+
+### Pennsylvania
+
+[Pittsburgh Rust Coffee](https://www.meetup.com/Pittsburgh-Rust-Coffee/), Pittsburgh, PA.
+
+### Texas
+
+[The Austin Rust Meetup](https://www.meetup.com/Austin-Rust-Meetup/), Austin, TX.
+
+### Washington
 
 [Seattle Rust Meetup](https://www.meetup.com/Seattle-Rust-Meetup/), Seattle, WA.

pt-BR/downloads.html

@@ -6,18 +6,20 @@
     <!-- -->
     <h1>Downloads</h1>
 
+    {% assign months = '/janeiro/fevereiro/março/abril/maio/junho/julho/agosto/setembro/outubro/novembro/dezembro' | split: '/' -%}
+    {% assign stable_month = site.stable_date | date: '%-m' | plus: '0' -%}
+    {% assign beta_month = site.beta_date | date: '%-m' | plus: '0' -%}
     <hr>
 
     <div class="row install">
       <div class="col-md-4 side-header">
         <h2 id="stable">{{ site.stable }}&nbsp;</h2>
-        <h3>{{ site.stable_date }}</h3>
+	<h3>{{ site.stable_date | date: '%-d' }} de {{ months[stable_month] }} de {{ site.stable_date | date: '%Y' }}</h3>
         <p>
 	  O
           <a href="http://blog.rust-lang.org{{ site.stable_blog }}">
-	    atual lançamento estável de rust
-	  </a>
-	  , atualizado à cada 6 semanas e compatível com versões anteriores.
+	    atual lançamento estável de rust</a>,
+	  atualizado à cada 6 semanas e compatível com versões anteriores.
         </p>
       </div>
       <div class="col-md-8">
@@ -67,7 +69,7 @@ <h2 id="beta">Beta&nbsp; ({{ site.beta }})</h2>
   Uma preview da versão estável que virá, intencionada para teste por
   autores de pacotes. Atualizado à cada seis semanas e quando necessário.
         </p>
-        <p><em>Esperado lançamento como estável:<br/>{{ site.beta_date }}</em>.<p>
+        <p><em>Esperado lançamento como estável:<br/>{{ site.beta_date | date: '%-d' }} de {{ months[beta_month] }} de {{ site.beta_date | date: '%Y' }}</em>.<p>
       </div>
       <div class="col-md-8">
         <table class="table-features table-installers"><tbody>

pt-BR/index.html

@@ -17,7 +17,11 @@
       <div class="col-md-4 install-box">
         <span class="version-rec-box-inner">
           Versão recomendada:<br>
-          <span id="install-version">
+          <span id="install-version"
+                data-type-linux="Binário Linux"
+                data-type-windows="Instalador Windows"
+                data-type-mac="Instalador Mac"
+                data-type-source="source">
             {{ site.stable }}
             (<span>source</span>)
           </span>