Remove usages of the now-unused license col on the crates table

This is a big change!  `cargo check` says this is fine, but some
manual verification and testing is probably a good idea.  (`cargo test`
does pass locally for me, but that only tells half the story.)

As part of (GitHub) #736, this commit not only removes the commitment
of license information into the database, but it also removes the
handling in the controller.  For silent backwards compatibility, it
might be better to simply drop the license field, for example if it's
being uploaded by outdated clients.  I am not sure, however, and will
probably need feedback on this.

(A commit running `cargo fmt` was also rebased into this one.)

Signed-off-by: Kristofer Rye <[email protected]>

Author: rye

src/controllers/krate/publish.rs

@@ -79,17 +79,12 @@ pub fn publish(req: &mut dyn Request) -> CargoResult<Response> {
             documentation: new_crate.documentation.as_ref().map(|s| &**s),
             readme: new_crate.readme.as_ref().map(|s| &**s),
             repository: repo.as_ref().map(String::as_str),
-            license: new_crate.license.as_ref().map(|s| &**s),
             max_upload_size: None,
         };
 
         let license_file = new_crate.license_file.as_ref().map(|s| &**s);
-        let krate = persist.create_or_update(
-            &conn,
-            license_file,
-            user.id,
-            Some(&app.config.publish_rate_limit),
-        )?;
+        let krate =
+            persist.create_or_update(&conn, user.id, Some(&app.config.publish_rate_limit))?;
 
         let owners = krate.owners(&conn)?;
         if user.rights(req.app(), &owners)? < Rights::Publish {

src/models/krate.rs

@@ -42,7 +42,6 @@ pub struct Crate {
     pub description: Option<String>,
     pub homepage: Option<String>,
     pub documentation: Option<String>,
-    pub license: Option<String>,
     pub repository: Option<String>,
     pub max_upload_size: Option<i32>,
 }
@@ -58,7 +57,6 @@ type AllColumns = (
     crates::description,
     crates::homepage,
     crates::documentation,
-    crates::license,
     crates::repository,
     crates::max_upload_size,
 );
@@ -72,7 +70,6 @@ pub const ALL_COLUMNS: AllColumns = (
     crates::description,
     crates::homepage,
     crates::documentation,
-    crates::license,
     crates::repository,
     crates::max_upload_size,
 );
@@ -97,20 +94,18 @@ pub struct NewCrate<'a> {
     pub readme: Option<&'a str>,
     pub repository: Option<&'a str>,
     pub max_upload_size: Option<i32>,
-    pub license: Option<&'a str>,
 }
 
 impl<'a> NewCrate<'a> {
     pub fn create_or_update(
         mut self,
         conn: &PgConnection,
-        license_file: Option<&'a str>,
         uploader: i32,
         rate_limit: Option<&PublishRateLimit>,
     ) -> CargoResult<Crate> {
         use diesel::update;
 
-        self.validate(license_file)?;
+        self.validate()?;
         self.ensure_name_not_reserved(conn)?;
 
         conn.transaction(|| {
@@ -132,7 +127,7 @@ impl<'a> NewCrate<'a> {
         })
     }
 
-    fn validate(&mut self, license_file: Option<&'a str>) -> CargoResult<()> {
+    fn validate(&mut self) -> CargoResult<()> {
         fn validate_url(url: Option<&str>, field: &str) -> CargoResult<()> {
             let url = match url {
                 Some(s) => s,
@@ -163,28 +158,6 @@ impl<'a> NewCrate<'a> {
         validate_url(self.homepage, "homepage")?;
         validate_url(self.documentation, "documentation")?;
         validate_url(self.repository, "repository")?;
-        self.validate_license(license_file)?;
-        Ok(())
-    }
-
-    fn validate_license(&mut self, license_file: Option<&str>) -> CargoResult<()> {
-        if let Some(license) = self.license {
-            for part in license.split('/') {
-                license_exprs::validate_license_expr(part).map_err(|e| {
-                    human(&format_args!(
-                        "{}; see http://opensource.org/licenses \
-                         for options, and http://spdx.org/licenses/ \
-                         for their identifiers",
-                        e
-                    ))
-                })?;
-            }
-        } else if license_file.is_some() {
-            // If no license is given, but a license file is given, flag this
-            // crate as having a nonstandard license. Note that we don't
-            // actually do anything else with license_file currently.
-            self.license = Some("non-standard");
-        }
         Ok(())
     }
 

src/models/token.rs

@@ -96,5 +96,4 @@ mod tests {
             .find(r#""last_used_at":"2017-01-06T14:23:12+00:00""#)
             .is_some());
     }
-
 }

src/tasks/update_downloads.rs

@@ -103,7 +103,7 @@ mod test {
             name: "foo",
             ..Default::default()
         }
-        .create_or_update(conn, None, user_id, None)
+        .create_or_update(conn, user_id, None)
         .unwrap();
         let version = NewVersion::new(
             krate.id,

src/tests/builders.rs

@@ -234,7 +234,7 @@ impl<'a> CrateBuilder<'a> {
 
         let mut krate = self
             .krate
-            .create_or_update(connection, None, self.owner_id, None)?;
+            .create_or_update(connection, self.owner_id, None)?;
 
         // Since we are using `NewCrate`, we can't set all the
         // crate properties in a single DB call.