1 |
--- rustc-1.55.0-src/Cargo.lock.orig 2021-09-07 16:33:21.672163689 -0700 |
--- rustc-1.56.0-src/Cargo.lock.orig 2021-10-19 18:03:53.928187581 -0700 |
2 |
+++ rustc-1.55.0-src/Cargo.lock 2021-09-07 16:33:21.673163668 -0700 |
+++ rustc-1.56.0-src/Cargo.lock 2021-10-19 18:05:41.443522980 -0700 |
3 |
@@ -877,7 +877,6 @@ |
@@ -877,7 +877,6 @@ |
4 |
dependencies = [ |
dependencies = [ |
5 |
"cc", |
"cc", |
23 |
- |
- |
24 |
-[[package]] |
-[[package]] |
25 |
name = "libz-sys" |
name = "libz-sys" |
26 |
version = "1.1.2" |
version = "1.1.3" |
27 |
source = "registry+https://github.com/rust-lang/crates.io-index" |
source = "registry+https://github.com/rust-lang/crates.io-index" |
28 |
--- rustc-1.55.0-src/src/tools/cargo/Cargo.toml.orig 2021-09-07 16:33:21.673163668 -0700 |
--- rustc-1.56.0-src/src/tools/cargo/Cargo.toml.orig 2021-10-19 18:03:53.930187532 -0700 |
29 |
+++ rustc-1.55.0-src/src/tools/cargo/Cargo.toml 2021-09-07 16:34:59.637068004 -0700 |
+++ rustc-1.56.0-src/src/tools/cargo/Cargo.toml 2021-10-19 18:05:13.663211469 -0700 |
30 |
@@ -25,7 +25,7 @@ |
@@ -25,7 +25,7 @@ |
31 |
cargo-util = { path = "crates/cargo-util", version = "0.1.1" } |
cargo-util = { path = "crates/cargo-util", version = "0.1.1" } |
32 |
crates-io = { path = "crates/crates-io", version = "0.33.0" } |
crates-io = { path = "crates/crates-io", version = "0.33.0" } |
33 |
crossbeam-utils = "0.8" |
crossbeam-utils = "0.8" |
34 |
-curl = { version = "0.4.38", features = ["http2"] } |
-curl = { version = "0.4.38", features = ["http2"] } |
35 |
+curl = { version = "0.4.38", features = [] } |
+curl = { version = "0.4.38", features = [] } |
36 |
curl-sys = "0.4.45" |
curl-sys = "0.4.48" |
37 |
env_logger = "0.9.0" |
env_logger = "0.9.0" |
38 |
pretty_env_logger = { version = "0.4", optional = true } |
pretty_env_logger = { version = "0.4", optional = true } |
39 |
--- rustc-1.55.0-src/src/tools/cargo/src/cargo/core/package.rs.orig 2021-09-06 11:42:51.000000000 -0700 |
--- rustc-1.56.0-src/src/tools/cargo/src/cargo/core/package.rs.orig 2021-10-18 02:52:56.000000000 -0700 |
40 |
+++ rustc-1.55.0-src/src/tools/cargo/src/cargo/core/package.rs 2021-09-07 16:33:21.674163646 -0700 |
+++ rustc-1.56.0-src/src/tools/cargo/src/cargo/core/package.rs 2021-10-19 18:03:53.931187507 -0700 |
41 |
@@ -417,14 +417,8 @@ |
@@ -417,14 +417,8 @@ |
42 |
// Also note that pipelining is disabled as curl authors have indicated |
// Also note that pipelining is disabled as curl authors have indicated |
43 |
// that it's buggy, and we've empirically seen that it's buggy with HTTP |
// that it's buggy, and we've empirically seen that it's buggy with HTTP |
55 |
|
|
56 |
Ok(PackageSet { |
Ok(PackageSet { |
57 |
packages: package_ids |
packages: package_ids |
58 |
@@ -597,7 +591,7 @@ |
@@ -653,7 +647,7 @@ |
59 |
macro_rules! try_old_curl { |
macro_rules! try_old_curl { |
60 |
($e:expr, $msg:expr) => { |
($e:expr, $msg:expr) => { |
61 |
let result = $e; |
let result = $e; |