Auto merge of #7787 - alexcrichton:fix-tests, r=alexcrichton

Fix tests with `url` crate update Works around servo/rust-url#577
rust-lang · Jan 10, 2020 · 1814ca5 · 1814ca5
2 parents 6dd57b2 + dde2734
commit 1814ca5
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/cargo/util/canonical_url.rs b/src/cargo/util/canonical_url.rs
@@ -39,7 +39,9 @@ impl CanonicalUrl {
         // almost certainly not using the same case conversion rules that GitHub
         // does. (See issue #84)
         if url.host_str() == Some("github.com") {
-            url.set_scheme("https").unwrap();
+            url = format!("https{}", &url[url::Position::AfterScheme..])
+                .parse()
+                .unwrap();
             let path = url.path().to_lowercase();
             url.set_path(&path);
         }