Merge pull request #1733 from rust-lang/master

Deploy

Author: Manishearth

Cargo.lock

@@ -1 +1 @@
-VERSION=nightly-2021-04-15
+VERSION=nightly-2022-10-21

RustConfig

@@ -14,7 +14,7 @@ learn-rbe-button = Check out Rust by Example!
 translated-rbe = {""}
 translated-rbe-button = {""}
 
-learn-use = Grow with Rust
+learn-use = Documentation
 
 learn-doc-heading = Read the core documentation
 learn-doc = All of this documentation is also available locally using the <code>rustup doc</code> command, which will open up these resources for you in your browser without requiring a network connection!
@@ -119,6 +119,7 @@ learn-dependencies-steps = <p>Let’s add a dependency to our application. You c
       <p>In this project, we’ll use a crate called <a href="https://crates.io/crates/ferris-says"><code>ferris-says</code></a>.
       <p>In our <code>Cargo.toml</code> file we’ll add this information (that we got from the crate page):</p>
       { $cargotoml }
+      <p>We can also do this by running <code>cargo add [email protected]</code>.</p>
       <p>Now we can run:</p>
       <p><code>cargo build</code></p>
       <p>...and Cargo will install our dependency for us.</p>

locales/en-US/learn.ftl

@@ -1 +1 @@
-nightly-2021-04-15
+nightly-2022-10-21

rust-toolchain

@@ -92,11 +92,6 @@
   url: http://calyptech.com
   logo: calyptech.png
   how: "Used for high performance embedded system components as an alternative to C."
--
-  name: Cambridge Consultants
-  url: http://www.cambridgeconsultants.com/
-  logo: cambridge-consultants.png
-  how: "<a href='http://blog.cambridgeconsultants.com/wireless-product-development/presentation-mozillas-rust-and-why-we-love-it/'>We are writing and shipping Rust code on projects to our clients</a>."
 -
   name: Canonical
   url: http://www.canonical.com

src/data/users.yml

@@ -624,3 +624,33 @@ blockquote::before {
   /* Tachyons is missing this class */
   max-height: 10rem;
 }
+
+.select {
+  display: inline-block;
+  position: relative;
+}
+
+.select select {
+  appearance: none;
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  font-size: 1.25rem;
+  border: $gray 1px solid;
+  background-color: white;
+  padding: 2px 6px;
+  color: $gray;
+  box-sizing: border-box;
+}
+
+.select:after {
+  content: "";
+  position: absolute;
+  top: 50%;
+  right: 8px;
+  width: 0;
+  height: 0;
+  margin-top: -2px;
+  border-top: 5px solid $gray;
+  border-right: 5px solid transparent;
+  border-left: 5px solid transparent;
+}

src/styles/app.scss

@@ -234,6 +234,7 @@ mod tests {
                 weight: 0,
             }),
             github: None,
+            discord: vec![],
         }
     }
 

src/teams.rs

@@ -9,10 +9,12 @@
           <li><a href="https://users.rust-lang.org">{{fluent "footer-ask"}}</a></li>
         </ul>
         <div class="languages">
+          <div class="select">
             <label for="language-footer" class="hidden">{{fluent "choose-language"}}</label>
             <select id="language-footer">
-                {{> components/languages-dropdown}}
+              {{> components/languages-dropdown}}
             </select>
+          </div>
         </div>
       </div>
       <div class="flex flex-column mw8 w-100 measure-wide-l pv2 pv5-m pv2-ns ph4-m ph4-l">

templates/components/footer.hbs

@@ -19,10 +19,12 @@
   </ul>
 
   <div class=" w-100 w-auto-l flex-none flex justify-center pv4 pv-0-l languages">
-    <label for="language-nav" class="hidden">{{fluent "choose-language"}}</label>
-    <select id="language-nav" data-current-lang="{{lang}}">
-      {{> components/languages-dropdown}}
-    </select>
+    <div class="select">
+      <label for="language-nav" class="hidden">{{fluent "choose-language"}}</label>
+      <select id="language-nav" data-current-lang="{{lang}}">
+        {{> components/languages-dropdown}}
+      </select>
+    </div>
   </div>
 
 </nav>

templates/components/nav.hbs

@@ -13,7 +13,7 @@
       <div class="highlight"></div>
     </header>
     <section class="flex flex-column flex-row-l pv0-l">
-      <div class="flex flex-row flex-column-l justify-between-l mw8 measure-wide-l pb4 pb5-m pb6-ns ph4-l">
+      <div class="flex flex-row flex-column-l justify-between-l mw8 measure-wide-l pb4 pb5-m pb0-ns ph4-l">
         <div class="v-top pl4 pl0-l pt3-l measure-wide-l flex-l flex-column-l flex-auto-l">
           <p class="flex-grow-1">{{fluent "learn-book"}}</p>
           <div class="buttons">
@@ -22,15 +22,15 @@
           </div>
         </div>
       </div>
-      <div class="flex flex-row flex-column-l justify-between-l mw8 measure-wide-l pb4 pb5-m pb6-ns ph4-l">
+      <div class="flex flex-row flex-column-l justify-between-l mw8 measure-wide-l pb4 pb5-m pb0-ns ph4-l">
         <div class="v-top pl4 pl0-l pt3-l measure-wide-l flex-l flex-column-l flex-auto-l">
           <p class="flex-grow-1">{{fluent "learn-rustlings"}}</p>
           <div class="buttons">
             <a class="button button-secondary" href="https://github.com/rust-lang/rustlings/">{{fluent "learn-rustlings-button"}}</a>
           </div>
         </div>
       </div>
-      <div class="flex flex-row flex-column-l justify-between-l mw8 measure-wide-l pb4 pb5-m pb6-ns ph4-l">
+      <div class="flex flex-row flex-column-l justify-between-l mw8 measure-wide-l pb4 pb5-m pb0-ns ph4-l">
         <div class="v-top pl4 pl0-l pt3-l measure-wide-l flex-l flex-column-l flex-auto-l">
           <p class="flex-grow-1">{{fluent "learn-rbe"}}</p>
           <div class="buttons">