add Crate::Path variant

Author: zeegomo

src/config.rs

@@ -114,7 +114,7 @@ impl Config {
             Crate::Registry(ref details) => self.crates.get(&details.name),
             Crate::GitHub(ref repo) => self.github_repos.get(&repo.slug()),
             Crate::Local(ref name) => self.local_crates.get(name),
-            Crate::Git(_) => unimplemented!("unsupported crate"),
+            Crate::Git(_) | Crate::Path(_) => unimplemented!("unsupported crate"),
         }
     }
 

src/crates/lists.rs

@@ -96,7 +96,7 @@ pub(crate) fn get_crates(
                     Crate::Registry(RegistryCrate { ref name, .. }) => demo_registry.remove(name),
                     Crate::GitHub(ref repo) => demo_github.remove(&repo.slug()),
                     Crate::Local(ref name) => demo_local.remove(name),
-                    Crate::Git(_) => unimplemented!("unsupported crate"),
+                    Crate::Git(_) | Crate::Path(_) => unimplemented!("unsupported crate"),
                 };
 
                 if add {

src/crates/mod.rs

@@ -8,6 +8,7 @@ use percent_encoding::{percent_decode_str, utf8_percent_encode, NON_ALPHANUMERIC
 use rustwide::Crate as RustwideCrate;
 use std::convert::TryFrom;
 use std::fmt;
+use std::path::Path;
 use std::str::FromStr;
 
 pub(crate) use crate::crates::sources::github::GitHubRepo;
@@ -24,6 +25,7 @@ pub enum Crate {
     Registry(RegistryCrate),
     GitHub(GitHubRepo),
     Local(String),
+    Path(String),
     Git(GitRepo),
 }
 
@@ -39,6 +41,9 @@ impl Crate {
                 }
             }
             Crate::Local(ref name) => format!("local/{}", name),
+            Crate::Path(ref path) => {
+                format!("path/{}", utf8_percent_encode(&path, &NON_ALPHANUMERIC))
+            }
             Crate::Git(ref repo) => {
                 if let Some(ref sha) = repo.sha {
                     format!(
@@ -60,6 +65,7 @@ impl Crate {
                 RustwideCrate::git(&format!("https://github.com/{}/{}", repo.org, repo.name))
             }
             Self::Local(name) => RustwideCrate::local(&LOCAL_CRATES_DIR.join(name)),
+            Self::Path(path) => RustwideCrate::local(Path::new(&path)),
             Self::Git(repo) => RustwideCrate::git(&repo.url),
         }
     }
@@ -85,7 +91,7 @@ impl TryFrom<&'_ PackageId> for Crate {
                 name: name.to_string(),
                 version: version.to_string(),
             })),
-            [name, _, "path", _] => Ok(Crate::Local(name.to_string())),
+            [_, _, "path", path] => Ok(Crate::Path(path.to_string())),
             [_, _, "git", repo] => {
                 if repo.starts_with("https://github.com") {
                     Ok(Crate::GitHub(repo.replace("#", "/").parse()?))
@@ -131,6 +137,8 @@ impl fmt::Display for Crate {
                         format!("{}/{}", repo.org, repo.name)
                     },
                 Crate::Local(ref name) => format!("{} (local)", name),
+                Crate::Path(ref path) =>
+                    format!("{}", utf8_percent_encode(path, &NON_ALPHANUMERIC)),
                 Crate::Git(ref repo) =>
                     if let Some(ref sha) = repo.sha {
                         format!(
@@ -175,6 +183,9 @@ impl FromStr for Crate {
                 sha: None,
             })),
             ["local", name] => Ok(Crate::Local(name.to_string())),
+            ["path", path] => Ok(Crate::Path(
+                percent_decode_str(path).decode_utf8()?.to_string(),
+            )),
             _ => bail!("unexpected crate value"),
         }
     }
@@ -203,7 +214,7 @@ mod tests {
     #[test]
     fn test_parse_from_pkgid() {
         test_from_pkgid! {
-            "dummy 0.1.0 (path+file:///opt/rustwide/workdir)" => Crate::Local("dummy".to_string()),
+            "dummy 0.1.0 (path+file:///opt/rustwide/workdir)" => Crate::Path("file:///opt/rustwide/workdir".to_string()),
             "dummy 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" => Crate::Registry(RegistryCrate {
                 name: "dummy".to_string(),
                 version: "0.1.0".to_string()
@@ -270,6 +281,8 @@ mod tests {
 
         test_from_str! {
             "local/build-fail" => Crate::Local("build-fail".to_string()),
+            "path/pathtofile" => Crate::Path("pathtofile".to_string()),
+            &format!("path/{}", utf8_percent_encode("path/with:stange?characters", &NON_ALPHANUMERIC)) => Crate::Path("path/with:stange?characters".to_string()),
             "gh/org/user" => Crate::GitHub(GitHubRepo{org: "org".to_string(), name: "user".to_string(), sha: None}),
             "gh/org/user/sha" => Crate::GitHub(GitHubRepo{org: "org".to_string(), name: "user".to_string(), sha: Some("sha".to_string())}),
             "git/url" => Crate::Git(GitRepo{url: "url".to_string(), sha: None}),

src/report/mod.rs

@@ -6,7 +6,7 @@ use crate::results::{EncodedLog, EncodingType, ReadResults, TestResult};
 use crate::toolchain::Toolchain;
 use crate::utils;
 use mime::{self, Mime};
-use percent_encoding::{utf8_percent_encode, AsciiSet, NON_ALPHANUMERIC};
+use percent_encoding::{utf8_percent_encode, AsciiSet};
 use std::borrow::Cow;
 #[cfg(test)]
 use std::cell::RefCell;
@@ -134,11 +134,13 @@ fn crate_to_path_fragment(
             path.push("local");
             path.push(name);
         }
+        Crate::Path(ref krate_path) => {
+            path.push("path");
+            path.push(dest.sanitize(&krate_path).into_owned());
+        }
         Crate::Git(ref repo) => {
             path.push("git");
-
-            let name = utf8_percent_encode(&repo.url, &NON_ALPHANUMERIC).to_string();
-            path.push(dest.sanitize(&name).into_owned());
+            path.push(dest.sanitize(&repo.url).into_owned());
         }
     }
 
@@ -297,7 +299,7 @@ fn gen_retry_list(res: &TestResults) -> String {
         match krate {
             Crate::Registry(details) => writeln!(out, "{}", details.name).unwrap(),
             Crate::GitHub(repo) => writeln!(out, "{}/{}", repo.org, repo.name).unwrap(),
-            Crate::Local(_) | Crate::Git(_) => {}
+            Crate::Local(_) | Crate::Git(_) | Crate::Path(_) => {}
         }
     }
 
@@ -315,6 +317,7 @@ fn crate_to_name(c: &Crate) -> Fallible<String> {
             }
         }
         Crate::Local(ref name) => format!("{} (local)", name),
+        Crate::Path(ref path) => utf8_percent_encode(path, &REPORT_ENCODE_SET).to_string(),
         Crate::Git(ref repo) => {
             if let Some(ref sha) = repo.sha {
                 format!(
@@ -347,6 +350,7 @@ fn crate_to_url(c: &Crate) -> Fallible<String> {
             crate::CRATER_REPO_URL,
             name
         ),
+        Crate::Path(ref path) => utf8_percent_encode(path, &REPORT_ENCODE_SET).to_string(),
         Crate::Git(ref repo) => repo.url.clone(),
     })
 }