Merge branch 'licenses' of github.com:baileyn/crates.io into licenses

Author: baileyn

src/krate.rs

@@ -103,7 +103,6 @@ pub struct EncodableCrate {
     pub description: Option<String>,
     pub homepage: Option<String>,
     pub documentation: Option<String>,
-    pub license: Option<String>,
     pub repository: Option<String>,
     pub links: CrateLinks,
     pub exact_match: bool,
@@ -133,14 +132,13 @@ pub struct NewCrate<'a> {
 
 impl<'a> NewCrate<'a> {
     pub fn create_or_update(
-        mut self,
+        self,
         conn: &PgConnection,
-        license_file: Option<&str>,
         uploader: i32,
     ) -> CargoResult<Crate> {
         use diesel::update;
 
-        self.validate(license_file)?;
+        self.validate()?;
         self.ensure_name_not_reserved(conn)?;
 
         conn.transaction(|| {
@@ -161,7 +159,7 @@ impl<'a> NewCrate<'a> {
         })
     }
 
-    fn validate(&mut self, license_file: Option<&str>) -> CargoResult<()> {
+    fn validate(&self) -> CargoResult<()> {
         fn validate_url(url: Option<&str>, field: &str) -> CargoResult<()> {
             let url = match url {
                 Some(s) => s,
@@ -195,28 +193,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(())
     }
 
@@ -503,7 +479,6 @@ impl Crate {
             description,
             homepage,
             documentation,
-            license,
             repository,
             ..
         } = self;
@@ -529,7 +504,6 @@ impl Crate {
             homepage: homepage,
             exact_match: exact_match,
             description: description,
-            license: license,
             repository: repository,
             links: CrateLinks {
                 version_downloads: format!("/api/v1/crates/{}/downloads", name),
@@ -1083,8 +1057,9 @@ pub fn new(req: &mut Request) -> CargoResult<Response> {
             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)?;
+        let krate = persist.create_or_update(&conn, user.id)?;
 
         let owners = krate.owners(&conn)?;
         if rights(req.app(), &owners, &user)? < Rights::Publish {

src/tests/all.rs

@@ -325,7 +325,6 @@ impl<'a> CrateBuilder<'a> {
 
         let mut krate = self.krate.create_or_update(
             connection,
-            None,
             self.owner_id,
         )?;