Merge pull request rust-lang#1304 from jyn514/nightly-warnings

Fix nightly warnings

Author: jyn514

src/docbuilder/mod.rs

@@ -25,8 +25,8 @@ impl DocBuilder {
     pub fn new(config: Arc<Config>, db: Pool, build_queue: Arc<BuildQueue>) -> DocBuilder {
         DocBuilder {
             config,
-            build_queue,
             db,
+            build_queue,
         }
     }
 

src/utils/github_updater.rs

@@ -210,10 +210,8 @@ impl GithubUpdater {
         // When a node is missing (for example if the repository was deleted or made private) the
         // GraphQL API will return *both* a `null` instead of the data in the nodes list and a
         // `NOT_FOUND` error in the errors list.
-        for node in &response.data.nodes {
-            if let Some(node) = node {
-                self.store_repository(conn, &node)?;
-            }
+        for node in response.data.nodes.iter().flatten() {
+            self.store_repository(conn, &node)?;
         }
         for error in &response.errors {
             use GraphErrorPath::*;

src/web/crate_details.rs

@@ -60,12 +60,10 @@ fn optional_markdown<S>(markdown: &Option<String>, serializer: S) -> Result<S::O
 where
     S: Serializer,
 {
-    if let Some(ref markdown) = markdown {
-        Some(render_markdown(&markdown))
-    } else {
-        None
-    }
-    .serialize(serializer)
+    markdown
+        .as_ref()
+        .map(|markdown| render_markdown(&markdown))
+        .serialize(serializer)
 }
 
 #[derive(Debug, Clone, Eq, PartialEq, Serialize)]

src/web/page/templates.rs

@@ -193,7 +193,7 @@ impl ReturnValue {
 
 impl tera::Function for ReturnValue {
     fn call(&self, args: &HashMap<String, Value>) -> TeraResult<Value> {
-        debug_assert!(args.is_empty(), format!("{} takes no args", self.name));
+        debug_assert!(args.is_empty(), "{} takes no args", self.name);
         Ok(self.value.clone())
     }
 }