Merge remote-tracking branch 'origin/master' into text-contrast

Author: Aloso

README.md

@@ -1,7 +1,7 @@
-# new-rust-www
-> the home of the new rust website
+# www.rust-lang.org
+> the home of the rust website
 
-[![Build Status](https://travis-ci.org/rust-lang/beta.rust-lang.org.svg?token=hHeDp9pQmz9kvsgRNVHy&branch=master)](https://travis-ci.org/rust-lang/beta.rust-lang.org)
+[![Build Status](https://travis-ci.org/rust-lang/www.rust-lang.org.svg?branch=master)](https://travis-ci.org/rust-lang/www.rust-lang.org)
 
 ## Development
 

src/data/teams/community/team.yml

@@ -5,4 +5,4 @@ chat: "Community #general channel on Discord"
 repo: "https://github.com/rust-community/team"
 email: "[email protected]"
 leads: [ashleygwilliams]
-members: [skade, manishearth, sebasmagri, badboy, oe, technetos, jonathandturner]
+members: [skade, manishearth, sebasmagri, badboy, komaeda, technetos, jonathandturner]

src/data/teams/community/teams/rustbridge.yml

@@ -3,5 +3,5 @@ name: RustBridge team
 description: An inclusive educational initiative focused on bringing underrepresented groups into Rust.
 chat: "Community #rustbridge channel on Discord"
 repo: "https://github.com/rustbridge/team"
-leads: [oe]
+leads: [komaeda]
 members: [ashleygwilliams, technetos, arshiamufti, spacekookie, sebasmagri]

src/data/teams/documentation/team.yml

@@ -3,4 +3,4 @@ name: Documentation team
 description: ensuring Rust has fantastic documentation
 chat: Documentation Team #docs channel on Discord
 leads: [steveklabnik]
-members: [QuietMisdreavus, GuillaumeGomez]
+members: [QuietMisdreavus, GuillaumeGomez, frewsxcv]

templates/community/index.hbs

@@ -12,8 +12,11 @@
       The Rust programming language has many qualities, but Rust’s greatest
       strength is the community of people who come together to make working in
       Rust a rewarding experience.
-
     </p>
+    <p>
+      Stay up to date with the Rust community!
+    </p>
+    <a href="https://this-week-in-rust.org/" target="_blank" rel="noopener" class="button button-secondary">This Week in Rust</a>
     <p>
       We’d like to hear from you! Not sure where or who to ask a question? Want to get involved but aren’t sure how?
       The community team is eager to connect you with someone who can help!
@@ -184,7 +187,7 @@
       </div>
       <div class="mw-67-l mh3-l">
         <p>
-          Increasing Rust’s Reach is a  program matches Rust team members from all parts of the project with individuals who are underrepresented in Rust’s community and the tech industry for a partnership of three (3) months, from mid-May to mid-August. Each partnership agrees to a commitment of 3–5 hours per week working on a Rust Project.
+          Increasing Rust’s Reach is a program that matches Rust team members from all parts of the project with individuals who are underrepresented in Rust’s community and the tech industry for a partnership of three (3) months, from mid-May to mid-August. Each partnership agrees to a commitment of 3–5 hours per week working on a Rust Project.
         </p>
         <a href="http://reach.rust-lang.org/" target="_blank" rel="noopener"
            class="button button-secondary">Visit Website</a>

templates/footer.hbs

@@ -24,10 +24,10 @@
       </div>
       <div class="four columns mt3 mt0-l">
         <h4>Social</h4>
-        <a href="https://twitter.com/rustlang" target="_blank" rel="noopener" alt="twitter link"><img src="/static/images/twitter.svg" alt="twitter logo" title="Twitter"/></a>
-        <a href="https://www.youtube.com/channel/UCaYhcUwRBNscFNUKTjgPFiA" target="_blank" rel="noopener" alt="youtube link"><img style="padding-top: 6px; padding-bottom:6px" src="/static/images/youtube.svg" alt="youtube logo" title="YouTube"/></a>
-        <a href="https://discord.gg/rust-lang" target="_blank" rel="noopener" alt="discord link"><img src="/static/images/discord.svg" alt="discord logo" title="Discord"/></a>
-        <a href="https://github.com/rust-lang" target="_blank" rel="noopener" alt="github link"><img src="/static/images/github.svg" alt="github logo" title="GitHub"/></a>
+        <a href="https://twitter.com/rustlang" target="_blank" rel="noopener"><img src="/static/images/twitter.svg" alt="twitter logo" title="Twitter"/></a>
+        <a href="https://www.youtube.com/channel/UCaYhcUwRBNscFNUKTjgPFiA" target="_blank" rel="noopener"><img style="padding-top: 6px; padding-bottom:6px" src="/static/images/youtube.svg" alt="youtube logo" title="YouTube"/></a>
+        <a href="https://discord.gg/rust-lang" target="_blank" rel="noopener"><img src="/static/images/discord.svg" alt="discord logo" title="Discord"/></a>
+        <a href="https://github.com/rust-lang" target="_blank" rel="noopener"><img src="/static/images/github.svg" alt="github logo" title="GitHub"/></a>
       </div>
 
     </div>

templates/index.hbs

@@ -18,6 +18,7 @@
   </div>
 </header>
 
+{{> edition-banner }}
 {{> panels/language-values }}
 {{> panels/domains }}
 {{> panels/production }}

templates/layout.hbs

@@ -12,24 +12,24 @@
     <meta name="twitter:creator" content="@rustlang">
     <meta name="twitter:title" content="{{title}}">
     <meta name="twitter:description" content="Empowering everyone to build reliable and efficient software.">
-    <meta name="twitter:image" content="http://new-rust-www.herokuapp.com/static/images/rust-social.jpg">
+    <meta name="twitter:image" content="https://www.rust-lang.org/static/images/rust-social.jpg">
 
     <!-- Facebook OpenGraph -->
     <meta property="og:title" content="{{title}}" />
     <meta property="og:description" content="Empowering everyone to build reliable and efficient software.">
-    <meta property="og:image" content="http://new-rust-www.herokuapp.com/static/images/rust-social-wide.jpg" />
+    <meta property="og:image" content="https://www.rust-lang.org/static/images/rust-social-wide.jpg" />
     <meta property="og:type" content="website" />
     <meta property="og:locale" content="en_US" />
 
     <!-- fonts -->
-    <link rel="preload" as="font" crossorigin href="/static/fonts/AlfaSlabOne-Regular.ttf">
-    <link rel="preload" as="font" crossorigin href="/static/fonts/FiraSans-ExtraBold.ttf">
-    <link rel="preload" as="font" crossorigin href="/static/fonts/FiraSans-ExtraBoldItalic.ttf">
-    <link rel="preload" as="font" crossorigin href="/static/fonts/FiraSans-Italic.ttf">
-    <link rel="preload" as="font" crossorigin href="/static/fonts/FiraSans-Italic.ttf">
-    <link rel="preload" as="font" crossorigin href="/static/fonts/FiraSans-Regular.ttf">
-    <link rel="preload" as="font" crossorigin href="/static/fonts/FiraSans-SemiBold.ttf">
-    <link rel="preload" as="font" crossorigin href="/static/fonts/FiraSans-SemiBoldItalic.ttf">
+    <link rel="preload" as="font" crossorigin href="/static/fonts/woff/AlfaSlabOne-Regular.woff">
+    <link rel="preload" as="font" crossorigin href="/static/fonts/woff/FiraSans-ExtraBold.woff">
+    <link rel="preload" as="font" crossorigin href="/static/fonts/woff/FiraSans-ExtraBoldItalic.woff">
+    <link rel="preload" as="font" crossorigin href="/static/fonts/woff/FiraSans-Italic.woff">
+    <link rel="preload" as="font" crossorigin href="/static/fonts/woff/FiraSans-Italic.woff">
+    <link rel="preload" as="font" crossorigin href="/static/fonts/woff/FiraSans-Regular.woff">
+    <link rel="preload" as="font" crossorigin href="/static/fonts/woff/FiraSans-SemiBold.woff">
+    <link rel="preload" as="font" crossorigin href="/static/fonts/woff/FiraSans-SemiBoldItalic.woff">
 
     <!-- styles -->
     <link rel="stylesheet" href="/static/styles/vendor.css"/>
@@ -47,7 +47,6 @@
     <meta name="theme-color" content="#ffffff">
   </head>
   <body>
-    {{> edition-banner }}
     {{> nav}}
     <div id="main-content">
         {{~> page}}

templates/learn/get-started.hbs

@@ -13,27 +13,27 @@
       <h2>Installing Rust</h2>
       <div class="highlight highlight"></div>
     </header>
-    <h3><code>rustup</code>: the Rust installer and version management tool</h3>
-    <p>The primary way that folks install Rust is through a tool called <code>rustup</code> which is a Rust installer
+    <h3>Rustup: the Rust installer and version management tool</h3>
+    <p>The primary way that folks install Rust is through a tool called Rustup, which is a Rust installer
       and version management tool.</p>
     {{> tools/rustup }}
     <br /><br />
     <a href="/tools/install" class="button button-secondary">Learn more about installation</a>
     <hr />
-    <h3><code>cargo</code>: the Rust build tool and package manager</h3>
-    <p>When you install <code>rustup</code> you’ll also get the latest stable version of the Rust build tool and
-      package manager, also known as <code>cargo</code>. <code>cargo</code> does lots of things:</p>
+    <h3>Cargo: the Rust build tool and package manager</h3>
+    <p>When you install Rustup you’ll also get the latest stable version of the Rust build tool and
+      package manager, also known as Cargo. Cargo does lots of things:</p>
     <ul>
       <li>build your project with <code>cargo build</code></li>
       <li>run your project with <code>cargo run</code></li>
       <li>test your project with <code>cargo test</code></li>
-      <li>build documentaiton for your project with <code>cargo doc</code></li>
+      <li>build documentation for your project with <code>cargo doc</code></li>
       <li>publish a library to <a href="https://crates.io" target="_blank" rel="noopener">crates.io</a> with <code>cargo publish</code></li>
     </ul>
-    <p>To test that you have Rust and <code>cargo</code> installed, you can run this in your terminal of choice:</p>
+    <p>To test that you have Rust and Cargo installed, you can run this in your terminal of choice:</p>
     <p><code>cargo --version</code></p>
     <a href="https://doc.rust-lang.org/cargo/index.html" target="_blank" rel="noopener" class="button button-secondary">Read
-      the cargo book</a>
+        the cargo book</a>
     <hr />
     <h3>Other tools</h3>
     <p>Rust support is available in many editors:</p>
@@ -50,8 +50,7 @@
       <h2>Generating a new project</h2>
       <div class="highlight"></div>
     </header>
-    <p>Let’s write a small application with our new Rust development environment. To start, we’ll use <code>cargo</code>
-      to
+    <p>Let’s write a small application with our new Rust development environment. To start, we’ll use Cargo to
       make a new project for us. In your terminal of choice run:</p>
     <p><code>cargo new hello-rust</code></p>
     <p>This will generate a new directory called <code>hello-rust</code> with the following files:</p>
@@ -64,6 +63,15 @@
     <p><code>Cargo.toml</code> is the manifest file for Rust. It’s where you keep metadata for your project, as well as
       dependencies.</p>
     <p><code>src/main.rs</code> is where we’ll write our application code.</p>
+    <hr/>
+    <p><code>cargo new</code> generates a "Hello, world!" project for us! We can run this program by moving into the new directory that we made and running this in our terminal:</p>
+    <p><code>cargo run</code></p>
+    <p>You should see this in your terminal:</p>
+    <p><pre><code>$ cargo run
+   Compiling hello-rust v0.1.0 (/Users/ag_dubs/rust/hello-rust)
+    Finished dev [unoptimized + debuginfo] target(s) in 1.34s
+     Running `target/debug/hello-rust`
+Hello, world!</code></pre><p>
   </div>
 </section>
 
@@ -84,7 +92,7 @@ ferris-says = "0.1"</code></pre>
       </p>
       <p>Now we can run:</p>
       <p><code>cargo build</code></p>
-      <p>...and <code>cargo</code>will install our dependency for us.</p>
+      <p>...and Cargo will install our dependency for us.</p>
       <p>You’ll see that running this command created a new file for us, <code>Cargo.lock</code>. This file is a log of
         the exact versions of the dependencies we are using locally.</p>
       <p>To use this dependency, we can open <code>main.rs</code>, remove everything that’s in there (it’s just another
@@ -165,4 +173,4 @@ fn main() {
 </section>
 {{> tools/install-script }}
 {{/inline}}
-{{~> (parent)~}}
+{{~> (parent)~}}

templates/panels/get-involved.hbs

@@ -4,37 +4,28 @@
       <h2>Get involved</h2>
       <div class="highlight">
     </header>
-    <div class="row">
-      <div class="eight columns" id="contrubite-code">
-        <div class="row media">
-          <div class="six columns" id="read-rust">
-            <h3>Read Rust</h3>
-            <p>We love documentation! Take a look at the books available online, as well as key blog posts and user
-              guides.</p>
-            <a href="learn" class="button button-secondary">Read the book</a>
-          </div>
-          <div class="six columns" id="watch-rust">
-            <h3>Watch Rust</h3>
-            <p>The Rust community has a dedicated YouTube channel collecting a huge range of presentations and
-              tutorials.</p>
-            <a href="https://www.youtube.com/channel/UCaYhcUwRBNscFNUKTjgPFiA" class="button button-secondary">Watch the Videos</a>
-          </div>
+      <div class="row media">
+        <div class="six columns" id="read-rust">
+          <h3>Read Rust</h3>
+          <p>We love documentation! Take a look at the books available online, as well as key blog posts and user guides.</p>
+          <a href="learn" class="button button-secondary">Read the book</a>
         </div>
-        <div class="pt3">
-          <h3>Contribute code</h3>
-          <p>
-            Rust is truly a community effort, and we welcome contribution from hobbyists and production users, from
-            newcomers and seasoned professionals. Come help us make the Rust experience even better!
-          </p>
-          <a href="https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md" class="button button-secondary" target="_blank" rel="noopener">
-            Read Contribution Guide
-          </a>
+        <div class="six columns" id="watch-rust">
+          <h3>Watch Rust</h3>
+          <p>The Rust community has a dedicated YouTube channel collecting a huge range of presentations and
+              tutorials.</p>
+          <a href="https://www.youtube.com/channel/UCaYhcUwRBNscFNUKTjgPFiA" class="button button-secondary">Watch the Videos</a>
         </div>
       </div>
-      <div class="four columns" id="upcoming-events">
-        <h3>Upcoming events</h3>
-        <iframe class="twelve columns" title="rust community calendar" src="https://calendar.google.com/calendar/embed?showTitle=0&amp;showPrint=0&amp;showTabs=0&amp;showCalendars=0&amp;mode=AGENDA&amp;height=400&amp;wkst=1&amp;bgcolor=%23FFFFFF&amp;src=apd9vmbc22egenmtu5l6c5jbfc%40group.calendar.google.com&amp;color=%23691426&amp;ctz=Europe%2FMadrid"
-          style="border-width:0" height="400" frameborder="0" scrolling="no"></iframe>
+      <div class="pt3">
+        <h3>Contribute code</h3>
+        <p>
+          Rust is truly a community effort, and we welcome contribution from hobbyists and production users, from
+          newcomers and seasoned professionals. Come help us make the Rust experience even better!
+        </p>
+        <a href="https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md" class="button button-secondary" target="_blank" rel="noopener">
+          Read Contribution Guide
+        </a>
       </div>
     </div>
   </div>

templates/panels/production.hbs

@@ -7,7 +7,7 @@
     <div class="description">
       <p class="lh-copy f2">
         Hundreds of companies around the world are using Rust in production
-        today for fast, low resource, cross-platform solutions. Software you know
+        today for fast, low-resource, cross-platform solutions. Software you know
         and love, like <a href="https://hacks.mozilla.org/2017/08/inside-a-super-fast-css-engine-quantum-css-aka-stylo/" target="_blank" rel="noopener">Firefox</a>, <a href="https://blogs.dropbox.com/tech/2016/06/lossless-compression-with-brotli/" target="_blank" rel="noopener">Dropbox</a>, and <a href="https://blog.cloudflare.com/cloudflare-workers-as-a-serverless-rust-platform/" target="_blank" rel="noopener">Cloudflare</a>, uses Rust. <strong>From startups to large
         corporations, from embedded devices to scalable web services, Rust is a great fit.</strong>
       </p>

templates/what/cli/code-inputs.hbs

@@ -5,5 +5,5 @@ struct Cli {
     file: String,
     /// Number of lines to read
     #[structopt(short = "n")]
-    num: i32,
+    num: usize,
 }

templates/what/cli/code-main.hbs

@@ -1,7 +1,8 @@
 use quicli::prelude::*;
+use structopt::StructOpt;
 
 fn main() -> CliResult {
-    let args = Cli::from_args()?:
+    let args = Cli::from_args()?;
     read_file(&args.file)?
         .lines()
         .take(args.count)

templates/what/cli/maintainable.hbs

@@ -18,7 +18,7 @@
                     out these “what if” situations before you even run your
                     program.
                 </p>
-                <a href="https://doc.rust-lang.org/book/2018-edition/ch09-00-error-handling.html" target="_blank" rel="noopener" class="button button-secondary">
+                <a href="https://doc.rust-lang.org/book/ch09-00-error-handling.html" target="_blank" rel="noopener" class="button button-secondary">
                     Rust’s error handling
                 </a>
             </article>
@@ -33,7 +33,7 @@
                     features, refactor your application with the confidence that
                     you aren’t breaking anything.
                 </p>
-                <a href="https://doc.rust-lang.org/book/2018-edition/ch12-03-improving-error-handling-and-modularity.html" target="_blank" rel="noopener" class="button button-secondary">
+                <a href="https://doc.rust-lang.org/book/ch12-03-improving-error-handling-and-modularity.html" target="_blank" rel="noopener" class="button button-secondary">
                     Refactoring Rust
                 </a>
             </article>

templates/what/networking/production.hbs

@@ -49,7 +49,7 @@
                         compile time. Its low footprint and high performance, complemented by guaranteed memory safety
                         and rock-solid error handling make it perfect for writing security critical and complex
                         business logic for our backend. The ultra-high stability means that our Rust applications are
-                        the last past of our stack we ever have to worry about. We have been running a almost 100% Rust
+                        the last part of our stack we ever have to worry about. We have been running a almost 100% Rust
                         backend in production since end of 2015 and it has never failed us so far!
                     </blockquote>
                     <p class="attribution">
@@ -60,4 +60,4 @@
             </div>
         </div>
     </div>
-</section>
+</section>