Merge #1237 #1439 #1441

1237: Actually use JSON storage for JSON data r=carols10cents

We also never use `features` as a `HashMap<String, Vec<String>>`, so we
can just pass it through from the database in a lower level
representation.

1439: Bump `env_logger` r=carols10cents



1441: `dyn` all the things r=carols10cents

`#![deny(bare_trait_objects)]` is added and all existing trait objects
are documented with the `dyn` keyword.

Author: bors-voyager[bot]

Cargo.lock

@@ -39,7 +39,7 @@ openssl = "0.9.14"
 curl = "0.4"
 oauth2 = "0.3"
 log = "0.3"
-env_logger = "0.4"
+env_logger = "0.5"
 hex = "0.3"
 htmlescape = "0.3.1"
 license-exprs = "^1.3"

Cargo.toml

@@ -0,0 +1,3 @@
+ALTER TABLE versions ALTER COLUMN features DROP NOT NULL;
+ALTER TABLE versions ALTER COLUMN features DROP DEFAULT;
+ALTER TABLE versions ALTER COLUMN features SET DATA TYPE text;

migrations/2018-01-18-172821_use_jsonb_for_features/down.sql

@@ -0,0 +1,3 @@
+ALTER TABLE versions ALTER COLUMN features SET DATA TYPE jsonb USING features::jsonb;
+ALTER TABLE versions ALTER COLUMN features SET DEFAULT '{}';
+ALTER TABLE versions ALTER COLUMN features SET NOT NULL;

migrations/2018-01-18-172821_use_jsonb_for_features/up.sql

@@ -14,7 +14,7 @@ use std::sync::Arc;
 
 fn main() {
     // Initialize logging
-    env_logger::init().unwrap();
+    env_logger::init();
     let config = cargo_registry::Config::default();
 
     // If there isn't a git checkout containing the crate index repo at the path specified

src/bin/server.rs

@@ -5,7 +5,7 @@ use schema::categories;
 use views::{EncodableCategory, EncodableCategoryWithSubcategories};
 
 /// Handles the `GET /categories` route.
-pub fn index(req: &mut Request) -> CargoResult<Response> {
+pub fn index(req: &mut dyn Request) -> CargoResult<Response> {
     let conn = req.db_conn()?;
     let (offset, limit) = req.pagination(10, 100)?;
     let query = req.query();
@@ -34,7 +34,7 @@ pub fn index(req: &mut Request) -> CargoResult<Response> {
 }
 
 /// Handles the `GET /categories/:category_id` route.
-pub fn show(req: &mut Request) -> CargoResult<Response> {
+pub fn show(req: &mut dyn Request) -> CargoResult<Response> {
     let slug = &req.params()["category_id"];
     let conn = req.db_conn()?;
     let cat = categories::table
@@ -66,7 +66,7 @@ pub fn show(req: &mut Request) -> CargoResult<Response> {
 }
 
 /// Handles the `GET /category_slugs` route.
-pub fn slugs(req: &mut Request) -> CargoResult<Response> {
+pub fn slugs(req: &mut dyn Request) -> CargoResult<Response> {
     let conn = req.db_conn()?;
     let slugs = categories::table
         .select((categories::slug, categories::slug))

src/controllers/category.rs

@@ -7,7 +7,7 @@ use schema::{crate_owner_invitations, crate_owners};
 use views::{EncodableCrateOwnerInvitation, InvitationResponse};
 
 /// Handles the `GET /me/crate_owner_invitations` route.
-pub fn list(req: &mut Request) -> CargoResult<Response> {
+pub fn list(req: &mut dyn Request) -> CargoResult<Response> {
     let conn = &*req.db_conn()?;
     let user_id = req.user()?.id;
 
@@ -33,7 +33,7 @@ struct OwnerInvitation {
 }
 
 /// Handles the `PUT /me/crate_owner_invitations/:crate_id` route.
-pub fn handle_invite(req: &mut Request) -> CargoResult<Response> {
+pub fn handle_invite(req: &mut dyn Request) -> CargoResult<Response> {
     let conn = &*req.db_conn()?;
 
     let mut body = String::new();
@@ -52,7 +52,7 @@ pub fn handle_invite(req: &mut Request) -> CargoResult<Response> {
 }
 
 fn accept_invite(
-    req: &mut Request,
+    req: &mut dyn Request,
     conn: &PgConnection,
     crate_invite: InvitationResponse,
 ) -> CargoResult<Response> {
@@ -90,7 +90,7 @@ fn accept_invite(
 }
 
 fn decline_invite(
-    req: &mut Request,
+    req: &mut dyn Request,
     conn: &PgConnection,
     crate_invite: InvitationResponse,
 ) -> CargoResult<Response> {

src/controllers/crate_owner_invitation.rs

@@ -5,7 +5,7 @@ use models::Keyword;
 use views::EncodableKeyword;
 
 /// Handles the `GET /keywords` route.
-pub fn index(req: &mut Request) -> CargoResult<Response> {
+pub fn index(req: &mut dyn Request) -> CargoResult<Response> {
     use schema::keywords;
 
     let conn = req.db_conn()?;
@@ -46,7 +46,7 @@ pub fn index(req: &mut Request) -> CargoResult<Response> {
 }
 
 /// Handles the `GET /keywords/:keyword_id` route.
-pub fn show(req: &mut Request) -> CargoResult<Response> {
+pub fn show(req: &mut dyn Request) -> CargoResult<Response> {
     let name = &req.params()["keyword_id"];
     let conn = req.db_conn()?;
 

src/controllers/keyword.rs

@@ -14,7 +14,7 @@ use views::EncodableVersionDownload;
 use models::krate::to_char;
 
 /// Handles the `GET /crates/:crate_id/downloads` route.
-pub fn downloads(req: &mut Request) -> CargoResult<Response> {
+pub fn downloads(req: &mut dyn Request) -> CargoResult<Response> {
     use diesel::dsl::*;
     use diesel::sql_types::BigInt;
 

src/controllers/krate/downloads.rs

@@ -7,7 +7,7 @@ use controllers::prelude::*;
 use models::{Crate, Follow};
 use schema::*;
 
-fn follow_target(req: &mut Request) -> CargoResult<Follow> {
+fn follow_target(req: &mut dyn Request) -> CargoResult<Follow> {
     let user = req.user()?;
     let conn = req.db_conn()?;
     let crate_name = &req.params()["crate_id"];
@@ -19,7 +19,7 @@ fn follow_target(req: &mut Request) -> CargoResult<Follow> {
 }
 
 /// Handles the `PUT /crates/:crate_id/follow` route.
-pub fn follow(req: &mut Request) -> CargoResult<Response> {
+pub fn follow(req: &mut dyn Request) -> CargoResult<Response> {
     let follow = follow_target(req)?;
     let conn = req.db_conn()?;
     diesel::insert_into(follows::table)
@@ -31,7 +31,7 @@ pub fn follow(req: &mut Request) -> CargoResult<Response> {
 }
 
 /// Handles the `DELETE /crates/:crate_id/follow` route.
-pub fn unfollow(req: &mut Request) -> CargoResult<Response> {
+pub fn unfollow(req: &mut dyn Request) -> CargoResult<Response> {
     let follow = follow_target(req)?;
     let conn = req.db_conn()?;
     diesel::delete(&follow).execute(&*conn)?;
@@ -40,7 +40,7 @@ pub fn unfollow(req: &mut Request) -> CargoResult<Response> {
 }
 
 /// Handles the `GET /crates/:crate_id/following` route.
-pub fn following(req: &mut Request) -> CargoResult<Response> {
+pub fn following(req: &mut dyn Request) -> CargoResult<Response> {
     use diesel::dsl::exists;
 
     let follow = follow_target(req)?;

src/controllers/krate/follow.rs

@@ -14,7 +14,7 @@ use views::{
 use models::krate::ALL_COLUMNS;
 
 /// Handles the `GET /summary` route.
-pub fn summary(req: &mut Request) -> CargoResult<Response> {
+pub fn summary(req: &mut dyn Request) -> CargoResult<Response> {
     use schema::crates::dsl::*;
 
     let conn = req.db_conn()?;
@@ -98,7 +98,7 @@ pub fn summary(req: &mut Request) -> CargoResult<Response> {
 }
 
 /// Handles the `GET /crates/:crate_id` route.
-pub fn show(req: &mut Request) -> CargoResult<Response> {
+pub fn show(req: &mut dyn Request) -> CargoResult<Response> {
     use diesel::dsl::*;
 
     let name = &req.params()["crate_id"];
@@ -155,7 +155,7 @@ pub fn show(req: &mut Request) -> CargoResult<Response> {
 }
 
 /// Handles the `GET /crates/:crate_id/:version/readme` route.
-pub fn readme(req: &mut Request) -> CargoResult<Response> {
+pub fn readme(req: &mut dyn Request) -> CargoResult<Response> {
     let crate_name = &req.params()["crate_id"];
     let version = &req.params()["version"];
 
@@ -179,7 +179,7 @@ pub fn readme(req: &mut Request) -> CargoResult<Response> {
 /// Handles the `GET /crates/:crate_id/versions` route.
 // FIXME: Not sure why this is necessary since /crates/:crate_id returns
 // this information already, but ember is definitely requesting it
-pub fn versions(req: &mut Request) -> CargoResult<Response> {
+pub fn versions(req: &mut dyn Request) -> CargoResult<Response> {
     let crate_name = &req.params()["crate_id"];
     let conn = req.db_conn()?;
     let krate = Crate::by_name(crate_name).first::<Crate>(&*conn)?;
@@ -198,7 +198,7 @@ pub fn versions(req: &mut Request) -> CargoResult<Response> {
 }
 
 /// Handles the `GET /crates/:crate_id/reverse_dependencies` route.
-pub fn reverse_dependencies(req: &mut Request) -> CargoResult<Response> {
+pub fn reverse_dependencies(req: &mut dyn Request) -> CargoResult<Response> {
     use diesel::dsl::any;
 
     let name = &req.params()["crate_id"];

src/controllers/krate/metadata.rs

@@ -7,7 +7,7 @@ use models::{Crate, Owner, Rights, Team, User};
 use views::EncodableOwner;
 
 /// Handles the `GET /crates/:crate_id/owners` route.
-pub fn owners(req: &mut Request) -> CargoResult<Response> {
+pub fn owners(req: &mut dyn Request) -> CargoResult<Response> {
     let crate_name = &req.params()["crate_id"];
     let conn = req.db_conn()?;
     let krate = Crate::by_name(crate_name).first::<Crate>(&*conn)?;
@@ -25,7 +25,7 @@ pub fn owners(req: &mut Request) -> CargoResult<Response> {
 }
 
 /// Handles the `GET /crates/:crate_id/owner_team` route.
-pub fn owner_team(req: &mut Request) -> CargoResult<Response> {
+pub fn owner_team(req: &mut dyn Request) -> CargoResult<Response> {
     let crate_name = &req.params()["crate_id"];
     let conn = req.db_conn()?;
     let krate = Crate::by_name(crate_name).first::<Crate>(&*conn)?;
@@ -42,7 +42,7 @@ pub fn owner_team(req: &mut Request) -> CargoResult<Response> {
 }
 
 /// Handles the `GET /crates/:crate_id/owner_user` route.
-pub fn owner_user(req: &mut Request) -> CargoResult<Response> {
+pub fn owner_user(req: &mut dyn Request) -> CargoResult<Response> {
     let crate_name = &req.params()["crate_id"];
     let conn = req.db_conn()?;
     let krate = Crate::by_name(crate_name).first::<Crate>(&*conn)?;
@@ -59,16 +59,16 @@ pub fn owner_user(req: &mut Request) -> CargoResult<Response> {
 }
 
 /// Handles the `PUT /crates/:crate_id/owners` route.
-pub fn add_owners(req: &mut Request) -> CargoResult<Response> {
+pub fn add_owners(req: &mut dyn Request) -> CargoResult<Response> {
     modify_owners(req, true)
 }
 
 /// Handles the `DELETE /crates/:crate_id/owners` route.
-pub fn remove_owners(req: &mut Request) -> CargoResult<Response> {
+pub fn remove_owners(req: &mut dyn Request) -> CargoResult<Response> {
     modify_owners(req, false)
 }
 
-fn modify_owners(req: &mut Request, add: bool) -> CargoResult<Response> {
+fn modify_owners(req: &mut dyn Request, add: bool) -> CargoResult<Response> {
     let mut body = String::new();
     req.body().read_to_string(&mut body)?;
 

src/controllers/krate/owners.rs

@@ -24,7 +24,7 @@ use views::{EncodableCrate, EncodableCrateUpload};
 /// Currently blocks the HTTP thread, perhaps some function calls can spawn new
 /// threads and return completion or error through other methods  a `cargo publish
 /// --status` command, via crates.io's front end, or email.
-pub fn publish(req: &mut Request) -> CargoResult<Response> {
+pub fn publish(req: &mut dyn Request) -> CargoResult<Response> {
     let app = Arc::clone(req.app());
     let (new_crate, user) = parse_new_headers(req)?;
 
@@ -191,7 +191,7 @@ pub fn publish(req: &mut Request) -> CargoResult<Response> {
 /// This function parses the JSON headers to interpret the data and validates
 /// the data during and after the parsing. Returns crate metadata and user
 /// information.
-fn parse_new_headers(req: &mut Request) -> CargoResult<(EncodableCrateUpload, User)> {
+fn parse_new_headers(req: &mut dyn Request) -> CargoResult<(EncodableCrateUpload, User)> {
     // Read the json upload request
     let amt = u64::from(read_le_u32(req.body())?);
     let max = req.app().config.max_upload_size;

src/controllers/krate/publish.rs

@@ -31,7 +31,7 @@ use models::krate::{canon_crate_name, ALL_COLUMNS};
 /// caused the break. In the future, we should look at splitting this
 /// function out to cover the different use cases, and create unit tests
 /// for them.
-pub fn search(req: &mut Request) -> CargoResult<Response> {
+pub fn search(req: &mut dyn Request) -> CargoResult<Response> {
     use diesel::sql_types::Bool;
 
     let conn = req.db_conn()?;

src/controllers/krate/search.rs

@@ -26,7 +26,7 @@ mod prelude {
         fn pagination(&self, default: usize, max: usize) -> CargoResult<(i64, i64)>;
     }
 
-    impl<'a> RequestUtils for Request + 'a {
+    impl<'a> RequestUtils for dyn Request + 'a {
         fn json<T: Serialize>(&self, t: &T) -> Response {
             ::util::json_response(t)
         }

src/controllers/mod.rs

@@ -4,7 +4,7 @@ use super::prelude::*;
 ///
 /// The sha is contained within the `HEROKU_SLUG_COMMIT` environment variable.
 /// If `HEROKU_SLUG_COMMIT` is not set, returns `"unknown"`.
-pub fn show_deployed_sha(req: &mut Request) -> CargoResult<Response> {
+pub fn show_deployed_sha(req: &mut dyn Request) -> CargoResult<Response> {
     let deployed_sha =
         ::std::env::var("HEROKU_SLUG_COMMIT").unwrap_or_else(|_| String::from("unknown"));
 

src/controllers/site_metadata.rs

@@ -5,7 +5,7 @@ use schema::teams;
 use views::EncodableTeam;
 
 /// Handles the `GET /teams/:team_id` route.
-pub fn show_team(req: &mut Request) -> CargoResult<Response> {
+pub fn show_team(req: &mut dyn Request) -> CargoResult<Response> {
     use self::teams::dsl::{login, teams};
 
     let name = &req.params()["team_id"];

src/controllers/team.rs

@@ -10,7 +10,7 @@ use schema::api_tokens;
 use views::EncodableApiTokenWithToken;
 
 /// Handles the `GET /me/tokens` route.
-pub fn list(req: &mut Request) -> CargoResult<Response> {
+pub fn list(req: &mut dyn Request) -> CargoResult<Response> {
     let tokens = ApiToken::belonging_to(req.user()?)
         .order(api_tokens::created_at.desc())
         .load(&*req.db_conn()?)?;
@@ -22,7 +22,7 @@ pub fn list(req: &mut Request) -> CargoResult<Response> {
 }
 
 /// Handles the `PUT /me/tokens` route.
-pub fn new(req: &mut Request) -> CargoResult<Response> {
+pub fn new(req: &mut dyn Request) -> CargoResult<Response> {
     /// The incoming serialization format for the `ApiToken` model.
     #[derive(Deserialize, Serialize)]
     struct NewApiToken {
@@ -87,7 +87,7 @@ pub fn new(req: &mut Request) -> CargoResult<Response> {
 }
 
 /// Handles the `DELETE /me/tokens/:id` route.
-pub fn revoke(req: &mut Request) -> CargoResult<Response> {
+pub fn revoke(req: &mut dyn Request) -> CargoResult<Response> {
     let id = req.params()["id"]
         .parse::<i32>()
         .map_err(|e| bad_request(&format!("invalid token id: {:?}", e)))?;

src/controllers/token.rs

@@ -11,7 +11,7 @@ use schema::{crates, emails, follows, users, versions};
 use views::{EncodablePrivateUser, EncodableVersion};
 
 /// Handles the `GET /me` route.
-pub fn me(req: &mut Request) -> CargoResult<Response> {
+pub fn me(req: &mut dyn Request) -> CargoResult<Response> {
     // Changed to getting User information from database because in
     // src/tests/user.rs, when testing put and get on updating email,
     // request seems to be somehow 'cached'. When we try to get a
@@ -51,7 +51,7 @@ pub fn me(req: &mut Request) -> CargoResult<Response> {
 }
 
 /// Handles the `GET /me/updates` route.
-pub fn updates(req: &mut Request) -> CargoResult<Response> {
+pub fn updates(req: &mut dyn Request) -> CargoResult<Response> {
     use diesel::dsl::any;
 
     let user = req.user()?;
@@ -91,7 +91,7 @@ pub fn updates(req: &mut Request) -> CargoResult<Response> {
 }
 
 /// Handles the `PUT /user/:user_id` route.
-pub fn update_user(req: &mut Request) -> CargoResult<Response> {
+pub fn update_user(req: &mut dyn Request) -> CargoResult<Response> {
     use self::emails::user_id;
     use self::users::dsl::{email, gh_login, users};
     use diesel::{insert_into, update};
@@ -162,7 +162,7 @@ pub fn update_user(req: &mut Request) -> CargoResult<Response> {
 }
 
 /// Handles the `PUT /confirm/:email_token` route
-pub fn confirm_user_email(req: &mut Request) -> CargoResult<Response> {
+pub fn confirm_user_email(req: &mut dyn Request) -> CargoResult<Response> {
     use diesel::update;
 
     let conn = req.db_conn()?;
@@ -184,7 +184,7 @@ pub fn confirm_user_email(req: &mut Request) -> CargoResult<Response> {
 }
 
 /// Handles `PUT /user/:user_id/resend` route
-pub fn regenerate_token_and_send(req: &mut Request) -> CargoResult<Response> {
+pub fn regenerate_token_and_send(req: &mut dyn Request) -> CargoResult<Response> {
     use diesel::dsl::sql;
     use diesel::update;
 

src/controllers/user/me.rs

@@ -5,7 +5,7 @@ use schema::{crate_owners, crates, users};
 use views::EncodablePublicUser;
 
 /// Handles the `GET /users/:user_id` route.
-pub fn show(req: &mut Request) -> CargoResult<Response> {
+pub fn show(req: &mut dyn Request) -> CargoResult<Response> {
     use self::users::dsl::{gh_login, id, users};
 
     let name = &req.params()["user_id"].to_lowercase();
@@ -25,7 +25,7 @@ pub fn show(req: &mut Request) -> CargoResult<Response> {
 }
 
 /// Handles the `GET /users/:user_id/stats` route.
-pub fn stats(req: &mut Request) -> CargoResult<Response> {
+pub fn stats(req: &mut dyn Request) -> CargoResult<Response> {
     use diesel::dsl::sum;
 
     let user_id = &req.params()["user_id"].parse::<i32>().ok().unwrap();