ensure repo is a proper url

rust-lang/rust#142682 had some crater runs fail as crater didn't reject the invalid git repo url early

Author: Skgland

Cargo.lock

@@ -68,7 +68,7 @@ tera = "1.19.1"
 thiserror = "1.0.38"
 tokio = "1.24"
 toml = "0.8.6"
-url = "2"
+url = { version = "2", features = ["serde"] }
 walkdir = "2"
 warp = "0.3"
 zstd = "0.13.0"

Cargo.toml

@@ -248,7 +248,7 @@ pub(super) fn run_test(
         let mut build = build_dir.build(ctx.toolchain, krate, sandbox);
 
         for patch in ctx.toolchain.patches.iter() {
-            build = build.patch_with_git(&patch.name, &patch.repo, &patch.branch);
+            build = build.patch_with_git(&patch.name, &patch.repo.as_str(), &patch.branch);
         }
 
         detect_broken(build.run(|build| {

src/runner/test.rs

@@ -105,6 +105,8 @@ pub enum ToolchainParseError {
     InvalidFlag(String),
     #[error("invalid toolchain SHA: {0} is missing a `try#` or `master#` prefix")]
     PrefixMissing(String),
+    #[error("invalid url {0:?}: {1}")]
+    InvalidUrl(String, url::ParseError),
 }
 
 lazy_static! {
@@ -187,7 +189,9 @@ impl FromStr for Toolchain {
 #[derive(Serialize, Deserialize, PartialEq, Eq, Hash, Debug, Clone)]
 pub struct CratePatch {
     pub name: String,
-    pub repo: String,
+    // cargo currently doesn't accept scp-style "URLs" rust-lang/crates#1851
+    // so ensure its a proper URL
+    pub repo: url::Url,
     pub branch: String,
 }
 
@@ -202,7 +206,8 @@ impl FromStr for CratePatch {
         } else {
             Ok(CratePatch {
                 name: params[0].into(),
-                repo: params[1].into(),
+                repo: url::Url::parse(params[1])
+                    .map_err(|err| ToolchainParseError::InvalidUrl(params[1].into(), err))?,
                 branch: params[2].into(),
             })
         }
@@ -291,7 +296,7 @@ mod tests {
                         ci_try: $ci_try,
                         patches: vec![CratePatch {
                             name: "example".to_string(),
-                            repo: "https://git.example.com/some/repo".to_string(),
+                            repo: url::Url::parse("https://git.example.com/some/repo").unwrap(),
                             branch: "master".to_string()
                         }]
                     });
@@ -306,7 +311,7 @@ mod tests {
                         ci_try: $ci_try,
                         patches: vec![CratePatch {
                             name: "example".to_string(),
-                            repo: "https://git.example.com/some/repo".to_string(),
+                            repo: url::Url::parse("https://git.example.com/some/repo").unwrap(),
                             branch: "master".to_string()
                         }]
                     });