Save original dependency requirement string in the database when publishing

Author: Turbo87

src/models/dependency.rs

@@ -90,7 +90,7 @@ pub fn add_dependencies(
             let krate:Crate = Crate::by_exact_name(&dep.name)
                 .first(&*conn)
                 .map_err(|_| cargo_err(&format_args!("no known crate named `{}`", &*dep.name)))?;
-            if dep.version_req == semver::VersionReq::parse("*").unwrap() {
+            if semver::VersionReq::parse(&dep.version_req.0) == semver::VersionReq::parse("*") {
                 return Err(cargo_err(
                     "wildcard (`*` or `>= 0`) dependency constraints are not allowed \
                      on crates.io. See https://doc.rust-lang.org/cargo/faq.html#can-\

src/tests/builders/dependency.rs

@@ -15,7 +15,7 @@ impl DependencyBuilder {
             explicit_name_in_toml: None,
             name: name.to_string(),
             registry: None,
-            version_req: u::EncodableCrateVersionReq(semver::VersionReq::parse("> 0").unwrap()),
+            version_req: u::EncodableCrateVersionReq("> 0".to_string()),
         }
     }
 
@@ -38,10 +38,7 @@ impl DependencyBuilder {
     /// Panics if the `version_req` string specified isn't a valid `semver::VersionReq`.
     #[track_caller]
     pub fn version_req(mut self, version_req: &str) -> Self {
-        self.version_req = u::EncodableCrateVersionReq(
-            semver::VersionReq::parse(version_req)
-                .expect("version req isn't a valid semver::VersionReq"),
-        );
+        self.version_req = u::EncodableCrateVersionReq(version_req.to_string());
         self
     }
 

src/tests/krate.rs

@@ -907,10 +907,7 @@ fn new_krate_with_broken_dependency_requirement() {
 
     // create a request body with `version_req: "broken"`
     let (json, tarball) = crate_to_publish.build();
-    let new_json = json.replace(
-        "\"version_req\":\">=1.2.3, <2.0.0\"",
-        "\"version_req\":\"broken\"",
-    );
+    let new_json = json.replace("\"version_req\":\"1.2.3\"", "\"version_req\":\"broken\"");
     assert_ne!(json, new_json);
     let body = PublishBuilder::create_publish_body(&new_json, &tarball);
 

src/views/krate_publish.rs

@@ -41,7 +41,7 @@ pub struct EncodableCrateName(pub String);
 #[derive(Debug, Deref)]
 pub struct EncodableCrateVersion(pub semver::Version);
 #[derive(Debug, Deref)]
-pub struct EncodableCrateVersionReq(pub semver::VersionReq);
+pub struct EncodableCrateVersionReq(pub String);
 #[derive(Serialize, Debug, Deref, Default)]
 pub struct EncodableKeywordList(pub Vec<EncodableKeyword>);
 #[derive(Serialize, Debug, Deref)]
@@ -152,7 +152,7 @@ impl<'de> Deserialize<'de> for EncodableCrateVersionReq {
     fn deserialize<D: Deserializer<'de>>(d: D) -> Result<EncodableCrateVersionReq, D::Error> {
         let s = String::deserialize(d)?;
         match semver::VersionReq::parse(&s) {
-            Ok(v) => Ok(EncodableCrateVersionReq(v)),
+            Ok(_) => Ok(EncodableCrateVersionReq(s)),
             Err(..) => {
                 let value = de::Unexpected::Str(&s);
                 let expected = "a valid version req";
@@ -162,15 +162,6 @@ impl<'de> Deserialize<'de> for EncodableCrateVersionReq {
     }
 }
 
-impl<T: ?Sized> PartialEq<T> for EncodableCrateVersionReq
-where
-    semver::VersionReq: PartialEq<T>,
-{
-    fn eq(&self, rhs: &T) -> bool {
-        self.0 == *rhs
-    }
-}
-
 impl<'de> Deserialize<'de> for EncodableKeywordList {
     fn deserialize<D: Deserializer<'de>>(d: D) -> Result<EncodableKeywordList, D::Error> {
         let inner = <Vec<EncodableKeyword> as Deserialize<'de>>::deserialize(d)?;