Merge remote-tracking branch 'upstream/master' into dyn-all-the-things

Author: carols10cents

.travis.yml

@@ -49,9 +49,9 @@ matrix:
   allow_failures:
     - rust: nightly
   include:
-    - rust: nightly-2018-03-31
+    - rust: nightly-2018-06-26
       script:
-        - cargo install --force clippy --vers 0.0.191
+        - cargo install --force clippy --vers 0.0.210
         - cargo clippy
     - rust: stable
       script:

Cargo.lock

@@ -30,7 +30,7 @@ rustdoc-args = [
 cargo-registry-s3 = { path = "src/s3", version = "0.2.0" }
 rand = "0.3"
 git2 = "0.6.4"
-flate2 = "0.2"
+flate2 = "1.0"
 semver = "0.5"
 url = "1.2.1"
 tar = "0.4.13"
@@ -43,7 +43,7 @@ env_logger = "0.4"
 hex = "0.3"
 htmlescape = "0.3.1"
 license-exprs = "^1.3"
-dotenv = "0.10.0"
+dotenv = "0.11.0"
 toml = "0.4"
 diesel = { version = "1.3.0", features = ["postgres", "serde_json", "chrono", "r2d2"] }
 diesel_full_text_search = "1.0.0"
@@ -78,7 +78,7 @@ tokio-core = "0.1"
 tokio-service = "0.1"
 
 [build-dependencies]
-dotenv = "0.10"
+dotenv = "0.11"
 diesel = { version = "1.3.0", features = ["postgres"] }
 diesel_migrations = { version = "1.3.0", features = ["postgres"] }
 

Cargo.toml

@@ -61,7 +61,7 @@ fn main() {
     let args: Args = Docopt::new(USAGE)
         .and_then(|d| d.deserialize())
         .unwrap_or_else(|e| e.exit());
-    let config: Config = Default::default();
+    let config = Config::default();
     let conn = cargo_registry::db::connect_now().unwrap();
 
     let start_time = Utc::now();
@@ -133,10 +133,12 @@ fn main() {
         let mut tasks = Vec::with_capacity(page_size as usize);
         for (version, krate_name) in versions {
             let config = config.clone();
-            version.record_readme_rendering(&conn).expect(&format!(
-                "[{}-{}] Couldn't record rendering time",
-                krate_name, version.num
-            ));
+            version.record_readme_rendering(&conn).unwrap_or_else(|_| {
+                panic!(
+                    "[{}-{}] Couldn't record rendering time",
+                    krate_name, version.num
+                )
+            });
             let handle = thread::spawn(move || {
                 println!("[{}-{}] Rendering README...", krate_name, version.num);
                 let readme = get_readme(&config, &version, &krate_name);
@@ -155,10 +157,12 @@ fn main() {
                         "text/html",
                         readme_len as u64,
                     )
-                    .expect(&format!(
-                        "[{}-{}] Couldn't upload file to S3",
-                        krate_name, version.num
-                    ));
+                    .unwrap_or_else(|_| {
+                        panic!(
+                            "[{}-{}] Couldn't upload file to S3",
+                            krate_name, version.num
+                        )
+                    });
             });
             tasks.push(handle);
         }
@@ -181,10 +185,8 @@ fn get_readme(config: &Config, version: &Version, krate_name: &str) -> Option<St
         None => return None,
     };
     let date = Utc::now().to_rfc2822();
-    let url = Url::parse(&location).expect(&format!(
-        "[{}-{}] Couldn't parse crate URL",
-        krate_name, version.num
-    ));
+    let url = Url::parse(&location)
+        .unwrap_or_else(|_| panic!("[{}-{}] Couldn't parse crate URL", krate_name, version.num));
 
     let mut headers = List::new();
     headers
@@ -220,22 +222,23 @@ fn get_readme(config: &Config, version: &Version, krate_name: &str) -> Option<St
         return None;
     }
     let reader = Cursor::new(response);
-    let reader = GzDecoder::new(reader).expect(&format!(
-        "[{}-{}] Invalid gzip header",
-        krate_name, version.num
-    ));
+    let reader = GzDecoder::new(reader);
     let mut archive = Archive::new(reader);
-    let mut entries = archive.entries().expect(&format!(
-        "[{}-{}] Invalid tar archive entries",
-        krate_name, version.num
-    ));
+    let mut entries = archive.entries().unwrap_or_else(|_| {
+        panic!(
+            "[{}-{}] Invalid tar archive entries",
+            krate_name, version.num
+        )
+    });
     let manifest: Manifest = {
         let path = format!("{}-{}/Cargo.toml", krate_name, version.num);
         let contents = find_file_by_path(&mut entries, Path::new(&path), version, krate_name);
-        toml::from_str(&contents).expect(&format!(
-            "[{}-{}] Syntax error in manifest file",
-            krate_name, version.num
-        ))
+        toml::from_str(&contents).unwrap_or_else(|_| {
+            panic!(
+                "[{}-{}] Syntax error in manifest file",
+                krate_name, version.num
+            )
+        })
     };
 
     let rendered = {
@@ -252,10 +255,7 @@ fn get_readme(config: &Config, version: &Version, krate_name: &str) -> Option<St
                 .as_ref()
                 .map_or("README.md", |e| &**e),
             manifest.package.repository.as_ref().map(|e| &**e),
-        ).expect(&format!(
-            "[{}-{}] Couldn't render README",
-            krate_name, version.num
-        ))
+        ).unwrap_or_else(|_| panic!("[{}-{}] Couldn't render README", krate_name, version.num))
     };
     return Some(rendered);
 
@@ -290,22 +290,28 @@ fn find_file_by_path<R: Read>(
                 filepath == path
             }
         })
-        .expect(&format!(
-            "[{}-{}] couldn't open file: {}",
-            krate_name,
-            version.num,
-            path.display()
-        ))
-        .expect(&format!(
-            "[{}-{}] file is not present: {}",
-            krate_name,
-            version.num,
-            path.display()
-        ));
+        .unwrap_or_else(|| {
+            panic!(
+                "[{}-{}] couldn't open file: {}",
+                krate_name,
+                version.num,
+                path.display()
+            )
+        })
+        .unwrap_or_else(|_| {
+            panic!(
+                "[{}-{}] file is not present: {}",
+                krate_name,
+                version.num,
+                path.display()
+            )
+        });
     let mut contents = String::new();
-    file.read_to_string(&mut contents).expect(&format!(
-        "[{}-{}] Couldn't read file contents",
-        krate_name, version.num
-    ));
+    file.read_to_string(&mut contents).unwrap_or_else(|_| {
+        panic!(
+            "[{}-{}] Couldn't read file contents",
+            krate_name, version.num
+        )
+    });
     contents
 }

src/bin/render-readmes.rs

@@ -15,7 +15,7 @@ use std::sync::Arc;
 fn main() {
     // Initialize logging
     env_logger::init().unwrap();
-    let config: cargo_registry::Config = Default::default();
+    let config = cargo_registry::Config::default();
 
     // If there isn't a git checkout containing the crate index repo at the path specified
     // by `GIT_REPO_CHECKOUT`, delete that directory and clone the repo specified by `GIT_REPO_URL`

src/bin/server.rs

@@ -7,8 +7,9 @@
 use controllers::prelude::*;
 use models::{Category, Crate, CrateCategory, CrateDownload, CrateKeyword, Keyword, Version};
 use schema::*;
-use views::{EncodableCategory, EncodableCrate, EncodableDependency, EncodableKeyword,
-            EncodableVersion};
+use views::{
+    EncodableCategory, EncodableCrate, EncodableDependency, EncodableKeyword, EncodableVersion,
+};
 
 use models::krate::ALL_COLUMNS;
 

src/controllers/krate/metadata.rs

@@ -58,7 +58,7 @@ pub fn new(req: &mut dyn Request) -> CargoResult<Response> {
         .map_err(|e| bad_request(&format!("invalid new token request: {:?}", e)))?;
 
     let name = &new.api_token.name;
-    if name.len() < 1 {
+    if name.is_empty() {
         return Err(bad_request("name must have a value"));
     }
 

src/controllers/token.rs

@@ -9,8 +9,10 @@ use url::Url;
 use app::App;
 use util::{human, CargoResult};
 
-use models::{Badge, Category, CrateOwner, Keyword, NewCrateOwnerInvitation, Owner, OwnerKind,
-             ReverseDependency, User, Version};
+use models::{
+    Badge, Category, CrateOwner, Keyword, NewCrateOwnerInvitation, Owner, OwnerKind,
+    ReverseDependency, User, Version,
+};
 use views::{EncodableCrate, EncodableCrateLinks};
 
 use models::helpers::with_count::*;

src/models/krate.rs

@@ -116,14 +116,14 @@ impl Team {
         // check that `team` is the `slug` in results, and grab its data
 
         // "sanitization"
-        fn whitelist(c: &char) -> bool {
-            match *c {
+        fn whitelist(c: char) -> bool {
+            match c {
                 'a'...'z' | 'A'...'Z' | '0'...'9' | '-' | '_' => false,
                 _ => true,
             }
         }
 
-        if let Some(c) = org_name.chars().find(whitelist) {
+        if let Some(c) = org_name.chars().find(|c| whitelist(*c)) {
             return Err(human(&format_args!(
                 "organization cannot contain special \
                  characters like {}",

src/models/team.rs

@@ -158,7 +158,8 @@ impl<'a> MarkdownRenderer<'a> {
 
         let use_relative = if let Some(base_url) = base_url {
             if let Ok(url) = Url::parse(base_url) {
-                url.host_str() == Some("github.com") || url.host_str() == Some("gitlab.com")
+                url.host_str() == Some("github.com")
+                    || url.host_str() == Some("gitlab.com")
                     || url.host_str() == Some("bitbucket.org")
             } else {
                 false

src/render.rs

@@ -705,7 +705,7 @@ fn new_crate_to_body_with_io(
 ) -> Vec<u8> {
     let mut tarball = Vec::new();
     {
-        let mut ar = tar::Builder::new(GzEncoder::new(&mut tarball, Compression::Default));
+        let mut ar = tar::Builder::new(GzEncoder::new(&mut tarball, Compression::default()));
         for &mut (name, ref mut data, size) in files {
             let mut header = tar::Header::new_gnu();
             t!(header.set_path(name));