Merge #1336

1336: Correct uploading features with `/`s r=sgrif

There was a use of `valid_feature_name` that didn't get changed to `valid_feature`. I've added a regression test that exercises more of the stack to ensure this doesn't happen again in the future.

Author: bors-voyager[bot]

src/views/krate_publish.rs

@@ -121,7 +121,7 @@ impl<'de> Deserialize<'de> for FeatureName {
 impl<'de> Deserialize<'de> for Feature {
     fn deserialize<D: Deserializer<'de>>(d: D) -> Result<Feature, D::Error> {
         let s = String::deserialize(d)?;
-        if !Crate::valid_feature_name(&s) {
+        if !Crate::valid_feature(&s) {
             let value = de::Unexpected::Str(&s);
             let expected = "a valid feature name";
             Err(de::Error::invalid_value(value, &expected))
@@ -225,3 +225,15 @@ impl ToSql<Text, Pg> for Feature {
         ToSql::<Text, Pg>::to_sql(&**self, out)
     }
 }
+
+#[test]
+fn feature_deserializes_for_valid_features() {
+    use serde_json as json;
+
+    assert!(json::from_str::<Feature>("\"foo\"").is_ok());
+    assert!(json::from_str::<Feature>("\"\"").is_err());
+    assert!(json::from_str::<Feature>("\"/\"").is_err());
+    assert!(json::from_str::<Feature>("\"%/%\"").is_err());
+    assert!(json::from_str::<Feature>("\"a/a\"").is_ok());
+    assert!(json::from_str::<Feature>("\"32-column-tables\"").is_ok());
+}