Merge branch 'master' into governance

Author: ashleygwilliams

.travis.yml

@@ -5,7 +5,7 @@ matrix:
   include:
 
   # tests pass
-  - rust: nightly-2018-07-18
+  - rust: nightly-2018-08-06
     script:
     - cargo test --all --locked
     - rustup component add rustfmt-preview

RustConfig

@@ -1 +1 @@
-VERSION=nightly-2018-07-18
+VERSION=nightly-2018-08-06

src/category.rs

@@ -25,7 +25,7 @@ impl Category {
 }
 
 impl<'r> FromParam<'r> for Category {
-    type Error = &'r RawStr;
+    type Error = String;
 
     fn from_param(param: &'r RawStr) -> Result<Self, Self::Error> {
         let res = param.url_decode();
@@ -34,10 +34,10 @@ impl<'r> FromParam<'r> for Category {
                 if is_category(&url) {
                     Ok(Category { name: url })
                 } else {
-                    Err(RawStr::from_str("no such category"))
+                    Err(format!("No category called <{}>", url))
                 }
             }
-            Err(e) => Err(RawStr::from_str("url illegal in utf-8")),
+            Err(e) => Err(format!("URL illegal in utf-8 ({})", e)),
         }
     }
 }

templates/community/index.hbs

@@ -20,18 +20,18 @@
       <div class="highlight highlight-red"></div>
     </header>
     <div class="row">
-      <div class="four columns">
+      <div class="four columns" id="meetups-usergroups">
         <h3>Meetups and User Groups</h3>
         <p>Billions upon billions upon billions upon billions upon billions upon billions upon billions?</p>
         <a href="/community/events" class="button button-secondary">Learn More</a>
         <a href="#" class="button button-secondary">Register Your Meetup</a>
       </div>
-      <div class="four columns">
+      <div class="four columns" id="conferences">
         <h3>Conferences</h3>
         <p>Stirred by starlight culture inconspicuous motes of rock and gas, culture billions upon billions colonies a very small stage in a vast cosmic arena across the centuries made in the.</p>
         <a href="/community/events" class="button button-secondary">Conf Lineup</a>
       </div>
-      <div class="four columns">
+      <div class="four columns" id="event-support">
         <h3>Event Support</h3>
         <p>Across the centuries the carbon in our apple pies a billion trillion concept of the number one.</p>
         <a href="/community/events" class="button button-secondary">FOSS Event Planner</a>

templates/contribute/index.hbs

@@ -10,12 +10,12 @@
   <div class="container">
     <p>Cosmic fugue, bits of moving fluff take root and flourish quasar circumnavigated hundreds of thousands circumnavigated kindling the energy hidden in matter stirred by starlight Drake Equation rich in mystery extraordinary claims require extraordinary evidence hundreds of thousands, take root and flourish another world a still more glorious dawn awaits. Finite but unbounded.</p>
     <div class="row">
-      <div class="six columns">
+      <div class="six columns" id="governance">
         <h3>Governance</h3>
         <p>Finite but unbounded. Across the centuries kindling the energy hidden in matter at the edge of forever, kindling the energy hidden in matter the carbon in our apple pies.</p>
         <a href="/governance" class="button button-secondary">governance</a>
       </div>
-      <div class="six columns">
+      <div class="six columns" id="community-standards">
         <h3>Community Standards</h3>
         <p>Great turbulent clouds not a sunrise but a galaxyrise a very small stage in a vast cosmic arena how far away, Drake Equation colonies a mote of dust suspended in a sunbeam. Astonishment?</p>
         <a href="/policies/code-of-conduct" class="button button-secondary">Code of Conduct</a>
@@ -32,15 +32,15 @@
     </header>
     <p>Star stuff harvesting star light and billions upon billions upon billions upon billions upon billions upon billions upon billions?</p>
     <div class="row">
-      <div class="four columns">
+      <div class="four columns" id="users-forum">
         <h3>Users Forum</h3>
         <a href="#" class="button button-secondary">URLO</a>
       </div>
-      <div class="four columns">
+      <div class="four columns" id="internals-forum">
         <h3>Internals Forum</h3>
         <a href="#" class="button button-secondary">IRLO</a>
       </div>
-      <div class="four columns">
+      <div class="four columns" id="chat-platforms">
         <h3>Chat Platforms</h3>
         <a href="#" class="button button-secondary">Discord</a>
         <a href="#" class="button button-secondary">IRC</a>
@@ -57,12 +57,12 @@
     </header>
     <p>Vangelis at the edge of forever. Tesseract? Quasar the sky calls to us star stuff harvesting star light. Apollonius of Perga Flatland emerged into consciousness. Cambrian explosion galaxies citizens of distant epochs! </p>
     <div class="row">
-      <div class="six columns">
+      <div class="six columns" id="rust-nursery">
         <h3>Rust Nursery</h3>
         <p>A still more glorious dawn awaits stirred by starlight. Tunguska event hydrogen atoms, cosmos, Hypatia, of brilliant syntheses two ghostly white figures in coveralls and helmets are soflty dancing! </p>
         <a href="/contribute/nursery" class="button button-secondary">Rust Nursey</a>
       </div>
-      <div class="six columns">
+      <div class="six columns" id="github-org">
         <h3>Github Org</h3>
         <p>Citizens of distant epochs take root and flourish, the sky calls to us citizens of distant epochs, preserve and cherish that pale blue dot at the edge of forever inconspicuous motes of rock and gas.</p>
         <a href="#" class="button button-secondary">Github Org</a>

templates/footer.hbs

@@ -1,17 +1,17 @@
 <footer>
   <div class="container">
     <div class="row">
-      <div class="four columns">
+      <div class="four columns" id="get-help">
         <h4>Get Help!</h4>
         <ul>
           <li><a href="#">The Rust Bookshelf</a></li>
           <li><a href="#">Contact the Rust Team</a></li>
         </ul>
         <div class="languages">
           {{> languages-dropdown }}
-        </div>        
+        </div>
       </div>
-      <div class="four columns">
+      <div class="four columns" id="terms-and-policies">
         <h4>Terms and Policies</h4>
         <ul>
           <li><a href="/policies">Policies Index</a></li>
@@ -21,7 +21,7 @@
           <li><a href="/policies/security">Security Disclosures</a></li>
         </ul>
       </div>
-      <div class="four columns">
+      <div class="four columns" id="rust-social">
         <h4>Social</h4>
         <a href="#"><img src="/static/images/twitter.svg"/></a>
         <a href="#"><img src="/static/images/youtube.svg"/></a>
@@ -34,5 +34,5 @@
       Maintained by the Rust Team. See a typo? Send a fix <a href="#">here</a>!
       <div>Icons made by <a href="http://www.freepik.com" title="Freepik">Freepik</a> from <a href="https://www.flaticon.com/" title="Flaticon">www.flaticon.com</a> is licensed by <a href="http://creativecommons.org/licenses/by/3.0/" title="Creative Commons BY 3.0" target="_blank">CC 3.0 BY</a></div>
     </div>
-  </div> 
+  </div>
 </footer>

templates/learn/getting-started.hbs

@@ -22,7 +22,7 @@
     <header>
       <h2>Generating a New Project</h2>
       <div class="highlight highlight-purple"></div>
-    </hedaer>
+    </header>
     <pre>cargo new</pre>
   </div>
 </section>
@@ -44,7 +44,7 @@
   <div class="container">
     <header>
       <h2>Manging Rust Versions</h2>
-      <div class="highlight highlight-yellow"</div>
+      <div class="highlight highlight-yellow"></div>
     </header>
     <p>Link to explaniner of channels</p>
     <pre>rustup +nightly</pre>

templates/learn/index.hbs

@@ -14,7 +14,7 @@
       <div class="highlight highlight-purple"></div>
     </header>
     <div class="row">
-      <div class="eight columns">
+      <div class="eight columns" id="the-book">
         <p>Affectionately nicknamed "the book," <a
         href="https://doc.rust-lang.org/book/">The Rust Programming
         Language</a> will give you an overview of the language from first
@@ -30,7 +30,7 @@
         <img src="http://via.placeholder.com/350x200">
       </div>
     </div>
-  </div> 
+  </div>
 </section>
 
 <section id="learn-use">
@@ -41,31 +41,31 @@
     </header>
     <p>Once you've gotten familliar with the basics of the language, these resources can help you increase your knowledge and help you when you're actually using Rust day-to-day.</p>
     <div class="row">
-      <div class="six columns">
+      <div class="six columns" id="improve-skills">
         <h3>Improve your skills!</h3>
         <p>This stuff can take you to the next level:</p>
         <div class="row">
-          <div class="six columns domain">
+          <div class="six columns domain" id="cli-guide">
             <img src="/static/images/cli.svg" />
             <h4>CLI Guide</h4>
           </div>
-          <div class="six columns domain">
+          <div class="six columns domain" id="webassembly-guide">
             <img src="/static/images/webassembly.svg" />
             <h4>WebAssembly Guide</h4>
           </div>
         </div>
         <div class="row">
-          <div class="six columns domain">
+          <div class="six columns domain" id="networking-guide">
             <img src="/static/images/networking.svg" />
             <h4>Networking Guide</h4>
           </div>
-          <div class="six columns domain">
+          <div class="six columns domain" id="embedded-guide">
             <img src="/static/images/embedded.svg" />
             <h4>Embedded Guide</h4>
           </div>
         </div>
       </div>
-      <div class="six columns">
+      <div class="six columns" id="helpful-references">
         <h3>Helpful References</h3>
         <p>Here's some reference material you'll find useful when writing Rust.</p>
         <ul>
@@ -87,15 +87,15 @@
     </header>
         <p>Curious about the darkest corners of the language? Here's where you can get into the nitty-gritty:</p>
     <div class="row">
-      <div class="four columns book">
+      <div class="four columns book" id="the-reference">
         <img src="/static/images/reference.svg" />
         <p><a href="https://doc.rust-lang.org/reference/index.html">The Reference</a> is not a formal spec, but is more detailed and comprehensive than the book.</p>
       </div>
-      <div class="four columns book">
+      <div class="four columns book" id="rustonomicon">
         <img src="/static/images/nomicon.svg" />
         <p><a href="https://doc.rust-lang.org/nomicon/index.html">The Rustonomicon</a> is your guidebook to the dark arts of unsafe Rust. It's also sometimes called "the 'nomicon."</p>
       </div>
-      <div class="four columns book">
+      <div class="four columns book" id="the-unstable-book">
         <img src="/static/images/unstable.svg" />
         <p><a href="https://doc.rust-lang.org/unstable-book/index.html">The Unstable Book</a> has documentation for unstable features that you can only use with nightly Rust.</p>
       </div>

templates/panels/domains.hbs

@@ -5,7 +5,7 @@
       <div class="highlight highlight-yellow"></div>
     </header>
     <div class="row">
-      <div class="three columns">
+      <div class="three columns" id="command-line">
         <div class="domain-icon">
           <img src="/static/images/cli.svg"/>
           <a href="/what/cli"><h3>Command Line</h3></a>
@@ -14,7 +14,7 @@
           This is written in the train from Varna to Galatz. Last night we all assembled a little before the time of sunset.
         </p>
       </div>
-      <div class="three columns">
+      <div class="three columns" id="web-assembly">
         <div class="domain-icon">
           <img src="/static/images/webassembly.svg"/>
           <a href="/what/wasm"><h3>Web Assembly</h3></a>
@@ -23,7 +23,7 @@
           Each of us had done his work as well as he could; so far as thought, and endeavour, and opportunity go, we are prepared for the whole of our journey, and for our work when we get to Galatz.
         </p>
       </div>
-      <div class="three columns">
+      <div class="three columns" id="networking">
         <div class="domain-icon">
           <img src="/static/images/networking.svg" />
           <a href="/what/server"><h3>Networking</h3></a>
@@ -32,7 +32,7 @@
           When the usual time came round Mrs. Harker prepared herself for her hypnotic effort; and after a longer and more serious effort on the part of Van Helsing than has been usually necessary, she sank into the trance
         </p>
       </div>
-      <div class="three columns">
+      <div class="three columns" id="embedded">
         <div class="domain-icon">
           <img src="/static/images/embedded.svg"/>
           <a href="/what/embedded"><h3>Embedded</h3></a>

templates/panels/get-involved.hbs

@@ -5,26 +5,26 @@
       <div class="highlight highlight-green">
     </header>
     <div class="row">
-      <div class="eight columns">
+      <div class="eight columns" id="contrubite-code">
           <div class="code">
             <h3>Contribute Code</h3>
             <p>Euclid radio telescope dispassionate extraterrestrial observer star stuff harvesting star light, courage of our questions radio telescope made in the interiors of collapsing stars, hydrogen atoms!</p>
             <a href="#" class="button button-secondary">Learn More</a>
           </div>
           <div class="row media">
-            <div class="six columns">
+            <div class="six columns" id="read-rust">
               <h3>Read Rust!</h3>
               <p>Billions upon billions citizens of distant epochs the only home we've ever known science cosmic ocean shores of the cosmic ocean culture.</p>
               <a href="#" class="button button-secondary">Learn More</a>
             </div>
-            <div class="six columns">
+            <div class="six columns" id="watch-rust">
               <h3>Watch Rust</h3>
               <p>Star stuff harvesting star light tingling of the spine a very small stage in a vast cosmic arena.</p>
               <a href="#" class="button button-secondary">Learn More</a>
             </div>
           </div>
       </div>
-      <div class="four columns">
+      <div class="four columns" id="upcoming-events">
         <h3>Upcoming Rust Events</h3>
         <iframe 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>