From 0338e785d66d6f5946b81f88cea3fb8f9ba24706 Mon Sep 17 00:00:00 2001
From: sdlzx <hdu_sdlzx@163.com>
Date: Thu, 16 Dec 2021 00:16:44 +0800
Subject: [PATCH] Update to 1.55.0

---
 rust.spec                        | 13 ++++++++-----
 rustc-1.51.0-disable-http2.patch | 12 ++++++------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/rust.spec b/rust.spec
index 1b6532b..62c8779 100644
--- a/rust.spec
+++ b/rust.spec
@@ -1,9 +1,9 @@
 %global rust_arches x86_64 i686 armv7hl aarch64 ppc64 ppc64le s390x
 %{!?channel: %global channel stable}
-%global bootstrap_rust 1.53.0
-%global bootstrap_cargo 1.53.0
-%global bootstrap_channel 1.53.0
-%global bootstrap_date 2021-10-14
+%global bootstrap_rust 1.54.0
+%global bootstrap_cargo 1.54.0
+%global bootstrap_channel 1.54.0
+%global bootstrap_date 2021-12-15
 %bcond_with llvm_static
 %bcond_with bundled_llvm
 %bcond_without bundled_libgit2
@@ -11,7 +11,7 @@
 %bcond_without curl_http2
 %bcond_without lldb
 Name:                rust
-Version:             1.54.0
+Version:             1.55.0
 Release:             1
 Summary:             The Rust Programming Language
 License:             (ASL 2.0 or MIT) and (BSD and MIT)
@@ -465,6 +465,9 @@ export %{rust_env}
 %{_mandir}/man1/cargo*.1*
 
 %changelog
+* Wed Dec 15 2021 sdlzx <hdu_sdlzx@163.com> - 1.55.0-1
+- Update to 1.55.0
+
 * Thu Oct 14 2021 sdlzx <hdu_sdlzx@163.com> - 1.54.0-1
 - Update to 1.54.0
 
diff --git a/rustc-1.51.0-disable-http2.patch b/rustc-1.51.0-disable-http2.patch
index 9198621..460c21f 100644
--- a/rustc-1.51.0-disable-http2.patch
+++ b/rustc-1.51.0-disable-http2.patch
@@ -28,13 +28,13 @@
 --- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2021-03-05 08:34:15.000000000 -0800
 +++ rustc-beta-src/src/tools/cargo/Cargo.toml	2021-03-09 10:32:38.096207704 -0800
 @@ -25,7 +25,7 @@
+ cargo-util = { path = "crates/cargo-util", version = "0.1.1" }
  crates-io = { path = "crates/crates-io", version = "0.33.0" }
  crossbeam-utils = "0.8"
- crypto-hash = "0.3.1"
--curl = { version = "0.4.23", features = ["http2"] }
-+curl = { version = "0.4.23", features = [] }
- curl-sys = "0.4.22"
- env_logger = "0.8.1"
+-curl = { version = "0.4.38", features = ["http2"] }
++curl = { version = "0.4.38", features = [] }
+ curl-sys = "0.4.45"
+ env_logger = "0.9.0"
  pretty_env_logger = { version = "0.4", optional = true }
 --- rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs.orig	2021-03-05 08:34:15.000000000 -0800
 +++ rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs	2021-03-09 10:32:38.096207704 -0800
@@ -46,7 +46,7 @@
 -        let multiplexing = config.http_config()?.multiplexing.unwrap_or(true);
 -        multi
 -            .pipelining(false, multiplexing)
--            .chain_err(|| "failed to enable multiplexing/pipelining in curl")?;
+-            .with_context(|| "failed to enable multiplexing/pipelining in curl")?;
 -
 -        // let's not flood crates.io with connections
 -        multi.set_max_host_connections(2)?;